Mercurial > hg > xemacs-beta

diff src/s/linux.h @ 108:360340f9fd5f r20-1b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b6
author cvs
date Mon, 13 Aug 2007 09:18:39 +0200
parents 131b0175ea99
children 9f59509498e1
line wrap: on
line diff
--- a/src/s/linux.h	Mon Aug 13 09:17:27 2007 +0200
+++ b/src/s/linux.h	Mon Aug 13 09:18:39 2007 +0200
@@ -236,13 +236,20 @@
 
 /* XEmacs addition: */
 /* Linux defines these in <values.h>, but they can't be used in #if's
-   Include values.h now so that we don't get complaints if it's included later. */
+   Include values.h now so that we don't get complaints if it's included
+   later.  This loses with glibc-2 (libc-6) */
+
+/* # include <features.h> */
+#if 0
+#if !(defined (__GLIBC__) && (__GLIBC__ >= 2))
 
 #include <values.h>
 #undef  SHORTBITS
 #undef  INTBITS
 #undef  LONGBITS
 
+#endif
+#endif
 /* The regex.o routines are a part of the GNU C-library used with Linux.  */
 /* However, sometimes they disagree with the src/regex.h that comes with Emacs,
    and that can make trouble in etags.c because it gets the regex.h from Emacs