--- a/src/s/linux.h	Mon Aug 13 09:00:04 2007 +0200
+++ b/src/s/linux.h	Mon Aug 13 09:02:59 2007 +0200
@@ -236,20 +236,13 @@
 
 /* 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.  This loses with glibc-2 (libc-6) */
-
-/* # include <features.h> */
-#if 0
-#if !(defined (__GLIBC__) && (__GLIBC__ >= 2))
+   Include values.h now so that we don't get complaints if it's included later. */
 
 #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
@@ -289,8 +282,3 @@
 #endif
 /* XEmacs: removed setpgrp() definition because we use setpgid() when
    it's available, and autodetect it. */
-
-/* glibc fuckage */
-#if defined __GLIBC__ && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || __GLIBC__ > 2)
-# define GETPGRP_NEEDS_ARG
-#endif