Attachment #799187 for bug #713418





#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

Lines 62-70 Link Here

(-)a/nx-X11/extras/Mesa/src/mesa/main/glheader.h (-3 lines)
62	#include <stdlib.h>	62	#include <stdlib.h>
63	#include <stdio.h>	63	#include <stdio.h>
64	#include <string.h>	64	#include <string.h>
65	#if defined(__linux__) && defined(__i386__)
66	#include <fpu_control.h>
67	#endif
68	#endif	65	#endif
69	#include <float.h>	66	#include <float.h>
70	#include <stdarg.h>	67	#include <stdarg.h>

Return to bug 713418

Lines 40-52 Link Here

(-)a/nx-X11/programs/Xserver/Xext/xf86bigfont.c (-7 lines)
40		40
41	#include <sys/types.h>	41	#include <sys/types.h>
42	#ifdef HAS_SHM	42	#ifdef HAS_SHM
43	#if defined(linux) && (!defined(__GNU_LIBRARY__) \|\| __GNU_LIBRARY__ < 2)
44	/* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
45	/* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
46	Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
47	PAGE_SIZE. It is defined in <asm/page.h>. */
48	#include <asm/page.h>
49	#endif
50	#ifdef SVR4	43	#ifdef SVR4
51	#include <sys/sysmacros.h>	44	#include <sys/sysmacros.h>
52	#endif	45	#endif