about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-12-07 21:06:29 +0000
committerRoland McGrath <roland@gnu.org>2004-12-07 21:06:29 +0000
commit77474ccd4646a58f96550325ac44cdb0e6a35e58 (patch)
treef1d7ce70349e91dae0a13a6c00a27df76122766e
parentd749aa57ebfc33b2a4586039e972a2dff58a5ef9 (diff)
downloadglibc-77474ccd4646a58f96550325ac44cdb0e6a35e58.tar.gz
glibc-77474ccd4646a58f96550325ac44cdb0e6a35e58.tar.xz
glibc-77474ccd4646a58f96550325ac44cdb0e6a35e58.zip
* sysdeps/posix/sysconf.c (__sysconf_check_spec): Only define cvs/fedora-glibc-20041208T1024
	if it will be actually used.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/posix/sysconf.c9
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2dd204b531..ea55466e6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/posix/sysconf.c (__sysconf_check_spec): Only define
+	if it will be actually used.
+
 2004-12-07  Roland McGrath  <roland@redhat.com>
 
 	* rt/tst-timer5.c (setup_test): New function.
diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c
index a4bc2e78b1..72212fe26d 100644
--- a/sysdeps/posix/sysconf.c
+++ b/sysdeps/posix/sysconf.c
@@ -34,7 +34,14 @@
 #include <regex.h>
 
 
+#define NEED_CHECK_SPEC \
+  (!defined _XBS5_ILP32_OFF32 || !defined _XBS5_ILP32_OFFBIG \
+   || !defined _XBS5_LP64_OFF64 || !defined _XBS5_LPBIG_OFFBIG \
+   || !defined _POSIX_V6_ILP32_OFF32 || !defined _POSIX_V6_ILP32_OFFBIG \
+   || !defined _POSIX_V6_LP64_OFF64 || !defined _POSIX_V6_LPBIG_OFFBIG)
+#if NEED_CHECK_SPEC
 static long int __sysconf_check_spec (const char *spec);
+#endif
 
 
 /* Get the value of the system variable NAME.  */
@@ -1210,6 +1217,7 @@ __sysconf (name)
 weak_alias (__sysconf, sysconf)
 libc_hidden_def (__sysconf)
 
+#if NEED_CHECK_SPEC
 static long int
 __sysconf_check_spec (const char *spec)
 {
@@ -1230,3 +1238,4 @@ __sysconf_check_spec (const char *spec)
   __set_errno (save_errno);
   return ret;
 }
+#endif