There are 3 stray apperances of IN_MODULE. I am inling the patches since they are trivial. --------------------------------------------------------- in xorg/xserver/xorg: the whole ifndef block is dead. --- GL/glx/glxscreens.orig 2006-02-16 14:09:05.000000000 +0200 +++ GL/glx/glxscreens.c 2006-02-16 14:09:22.000000000 +0200 @@ -38,11 +38,6 @@ #include <dix-config.h> #endif -#ifndef IN_MODULE -#include <string.h> -#include <signal.h> -#endif - #include <windowstr.h> #include "glxserver.h" --------------------------------------------------------- in xorg/proto/Trap: other extension headers do not include system files. --- xtrapdi.orig 2006-02-16 14:17:26.000000000 +0200 +++ xtrapdi.h 2006-02-16 14:17:51.000000000 +0200 @@ -45,9 +45,6 @@ #define NEED_REPLIES #define NEED_EVENTS -#ifndef IN_MODULE -#include <stdio.h> -#endif #include <X11/X.h> #include <X11/Xmd.h> #ifdef SMT --------------------------------------------------------- in dri/drm/shared-core/drm.h: this is guess since the xorg libdrm module is *not* built with IN_MODULE and the xorg libdri module does not call ioctl, so I guess it's ok to drop it. --- drm.orig 2006-02-16 14:25:01.000000000 +0200 +++ drm.h 2006-02-16 14:25:31.000000000 +0200 @@ -80,14 +80,7 @@ #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) -#if defined(__FreeBSD__) && defined(IN_MODULE) -/* Prevent name collision when including sys/ioccom.h */ -#undef ioctl #include <sys/ioccom.h> -#define ioctl(a,b,c) xf86ioctl(a,b,c) -#else -#include <sys/ioccom.h> -#endif /* __FreeBSD__ && xf86ioctl */ #define DRM_IOCTL_NR(n) ((n) & 0xff) #define DRM_IOC_VOID IOC_VOID #define DRM_IOC_READ IOC_OUT --------------------------------------------------------- the remaining apperances of IN_MODULE are in the relevant headers and the build system.
There also appears to be a stay XFree86LOADER in fb24_32.c: --- fb/fb24_32.orig 2006-02-16 15:50:15.000000000 +0200 +++ fb/fb24_32.c 2006-02-16 17:18:13.000000000 +0200 @@ -28,9 +28,6 @@ #endif #include <string.h> -#ifdef XFree86LOADER -#include "xf86.h" -#endif #include "fb.h"
And an appearance of XFree86Server in glx_ansic.h: --- GL/include/GL/glx_ansic.orig 2006-02-18 16:41:44.000000000 +0200 +++ GL/include/GL/glx_ansic.h 2006-02-18 20:17:17.000000000 +0200 @@ -54,25 +54,10 @@ ** tree and all should be taken care of. */ -#ifdef XFree86Server - #ifndef assert #define assert(a) #endif -#else - -#if defined(Lynx) && defined(__assert_h) -#undef __assert_h -#endif -#ifdef assert -#undef assert -#endif -#include <assert.h> - -#endif - - #define GLX_STDOUT stdout #define GLX_STDERR stderr #define __glXPrintf printf
GL/glx/glxscreens.c is clean now GL/include/GL/glx_ansic.h was dropped from other files. remaining: xorg/proto/Trap/xtrapdi.h dri/drm/shared-core/drm.h fb/fb24_32.c
Flagging as patch
Is anyone going to commit these patches?
Sorry about the phenomenal bug spam, guys. Adding xorg-team@ to the QA contact so bugs don't get lost in future.
(In reply to comment #3) > remaining: > xorg/proto/Trap/xtrapdi.h > dri/drm/shared-core/drm.h > fb/fb24_32.c drm and xserver/fb fixed a while ago, trapproto just now.
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.