[PATCH xserver 1/2] Drop workaround for pre-glibc linux

Julien Cristau jcristau at debian.org
Thu May 11 06:42:15 UTC 2017


It seems unlikely anyone still needs to build against libc4/libc5.

Signed-off-by: Julien Cristau <jcristau at debian.org>
---
 Xext/xf86bigfont.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 72bb774011..529595bb75 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -40,13 +40,6 @@
 
 #include <sys/types.h>
 #ifdef HAS_SHM
-#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
-/* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
-/* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
-   Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
-   PAGE_SIZE. It is defined in <asm/page.h>. */
-#include <asm/page.h>
-#endif
 #ifdef SVR4
 #include <sys/sysmacros.h>
 #endif
-- 
2.11.0



More information about the xorg-devel mailing list