aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-06-18 18:06:00 +0000
committerUlrich Drepper <drepper@redhat.com>1999-06-18 18:06:00 +0000
commit8432c71ab7bacf17bbcefa3a9b9caadbfd1755e4 (patch)
treea640dfbd14d51787c30535ab3e631373535fe4b9
parentdb95bdbce05c9876158e7b14ec6a827f7e2453d8 (diff)
downloadglibc-8432c71ab7bacf17bbcefa3a9b9caadbfd1755e4.tar
glibc-8432c71ab7bacf17bbcefa3a9b9caadbfd1755e4.tar.gz
glibc-8432c71ab7bacf17bbcefa3a9b9caadbfd1755e4.tar.bz2
glibc-8432c71ab7bacf17bbcefa3a9b9caadbfd1755e4.zip
Update.
1999-06-18 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/init-first.h: Add extra cast in argc assignment to avoid warning on 64bit platforms.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/configure2
-rw-r--r--sysdeps/unix/sysv/linux/init-first.h6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 836c7cd554..acf9b74ef2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-18 Ulrich Drepper <drepper@cygnus.com>
+
+ * sysdeps/unix/sysv/linux/init-first.h: Add extra cast in argc
+ assignment to avoid warning on 64bit platforms.
+
1999-06-17 Ulrich Drepper <drepper@cygnus.com>
* libio/libio.h (_IO_codecvt): Change __P ot __PMT.
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index fcdf97dc5c..b6530d18ae 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -13,7 +13,7 @@ if test -n "$sysheaders"; then
fi
echo $ac_n "checking installed Linux kernel header files""... $ac_c" 1>&6
echo "configure:16: checking installed Linux kernel header files" >&5
-if eval "test \"`echo '$''{'libc_cv_linux2010'+set}'`\" = set"; then
+if eval "test \"\${libc_cv_linux2010+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
diff --git a/sysdeps/unix/sysv/linux/init-first.h b/sysdeps/unix/sysv/linux/init-first.h
index a9df8da52d..aaf8a4f4dc 100644
--- a/sysdeps/unix/sysv/linux/init-first.h
+++ b/sysdeps/unix/sysv/linux/init-first.h
@@ -1,5 +1,5 @@
/* Prepare arguments for library initialization function.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -35,13 +35,13 @@ void NAME (void *arg) \
\
if (!__libc_multiple_libcs) \
{ \
- argc = (int) arg; \
+ argc = (int) (long int) arg; \
argv = (char **) &arg + 1; \
envp = &argv[argc+1]; \
} \
else \
{ \
- argc = (int) arg; \
+ argc = (int) (long int) arg; \
argv = ((char ***) &arg)[1]; \
envp = ((char ***) &arg)[2]; \
} \