aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/config/cf/xorg.cf4
-rw-r--r--nx-X11/extras/Mesa/include/GL/internal/glcore.h2
-rw-r--r--nx-X11/extras/Mesa/src/mesa/main/context.c4
-rw-r--r--nx-X11/extras/Mesa/src/mesa/main/glheader.h6
-rw-r--r--nx-X11/extras/Mesa/src/mesa/main/imports.c108
-rw-r--r--nx-X11/extras/Mesa/src/mesa/main/imports.h16
-rw-r--r--nx-X11/include/Xfuncs.h5
-rw-r--r--nx-X11/programs/Xserver/GL/glx/glxcmds.c2
-rw-r--r--nx-X11/programs/Xserver/GL/glx/glximports.c4
-rw-r--r--nx-X11/programs/Xserver/GL/glx/glxscreens.c4
-rw-r--r--nx-X11/programs/Xserver/GL/glx/glxutil.c2
-rw-r--r--nx-X11/programs/Xserver/GL/glx/single2.c4
-rw-r--r--nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h4
-rw-r--r--nx-X11/programs/Xserver/GL/include/GL/xf86glx.h4
-rw-r--r--nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/saver.c4
-rw-r--r--nx-X11/programs/Xserver/Xext/shape.c5
-rw-r--r--nx-X11/programs/Xserver/Xext/shm.c4
-rw-r--r--nx-X11/programs/Xserver/Xext/sync.c6
-rw-r--r--nx-X11/programs/Xserver/Xext/xtest.c3
-rw-r--r--nx-X11/programs/Xserver/Xext/xvdisp.c6
-rw-r--r--nx-X11/programs/Xserver/Xext/xvmain.c6
-rw-r--r--nx-X11/programs/Xserver/Xext/xvmc.c2
-rw-r--r--nx-X11/programs/Xserver/dbe/dbe.c6
-rw-r--r--nx-X11/programs/Xserver/dbe/midbe.c4
-rw-r--r--nx-X11/programs/Xserver/fb/fb24_32.c6
-rw-r--r--nx-X11/programs/Xserver/fb/fbarc.c6
-rw-r--r--nx-X11/programs/Xserver/fb/fbcompose.c6
-rw-r--r--nx-X11/programs/Xserver/fb/fbcopy.c5
-rw-r--r--nx-X11/programs/Xserver/fb/fbgc.c5
-rw-r--r--nx-X11/programs/Xserver/fb/fbimage.c7
-rw-r--r--nx-X11/programs/Xserver/fb/fboverlay.c3
-rw-r--r--nx-X11/programs/Xserver/fb/fbpict.c2
-rw-r--r--nx-X11/programs/Xserver/fb/fbpixmap.c5
-rw-r--r--nx-X11/programs/Xserver/fb/fbseg.c2
-rw-r--r--nx-X11/programs/Xserver/fb/fbwindow.c5
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/include/misc.h9
-rw-r--r--nx-X11/programs/Xserver/include/os.h8
-rw-r--r--nx-X11/programs/Xserver/mi/Imakefile10
-rw-r--r--nx-X11/programs/Xserver/mi/miinitext.c104
-rw-r--r--nx-X11/programs/Xserver/miext/cw/cw.c2
-rw-r--r--nx-X11/programs/Xserver/miext/cw/cw_ops.c2
-rw-r--r--nx-X11/programs/Xserver/miext/cw/cw_render.c2
-rw-r--r--nx-X11/programs/Xserver/miext/damage/damage.c2
-rw-r--r--nx-X11/programs/Xserver/os/osinit.c7
-rw-r--r--nx-X11/programs/Xserver/record/record.c4
-rw-r--r--nx-X11/programs/Xserver/record/set.c8
-rw-r--r--nx-X11/programs/Xserver/render/render.c3
49 files changed, 75 insertions, 357 deletions
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 470c9adb8..fb0dbfd08 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -556,8 +556,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
# define ExtraLoaderDefines /**/
#endif
-# define XFree86LoaderDefines /**/
-
#ifndef HasBsdMake
#define HasBsdMake NO
#endif
@@ -584,7 +582,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#ifndef XFree86ServerDefines
# define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \
XFree86XvDefines \
- XFree86LoaderDefines -DXFree86Server \
+ -DXFree86Server \
XFree86XvMCDefines \
SmartScheduleDefines \
DebugDefines XFree86XResDefines \
diff --git a/nx-X11/extras/Mesa/include/GL/internal/glcore.h b/nx-X11/extras/Mesa/include/GL/internal/glcore.h
index e0b06c7ca..9a864e7f2 100644
--- a/nx-X11/extras/Mesa/include/GL/internal/glcore.h
+++ b/nx-X11/extras/Mesa/include/GL/internal/glcore.h
@@ -36,9 +36,7 @@
**
*/
-#ifndef XFree86LOADER
#include <sys/types.h>
-#endif
#ifdef CAPI
#undef CAPI
diff --git a/nx-X11/extras/Mesa/src/mesa/main/context.c b/nx-X11/extras/Mesa/src/mesa/main/context.c
index eb4b4ce4e..9e98da669 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/context.c
+++ b/nx-X11/extras/Mesa/src/mesa/main/context.c
@@ -1034,11 +1034,7 @@ _mesa_init_constants( GLcontext *ctx )
/* If we're running in the X server, do bounds checking to prevent
* segfaults and server crashes!
*/
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- ctx->Const.CheckArrayBounds = GL_TRUE;
-#else
ctx->Const.CheckArrayBounds = GL_FALSE;
-#endif
ctx->Const.MaxDrawBuffers = MAX_DRAW_BUFFERS;
diff --git a/nx-X11/extras/Mesa/src/mesa/main/glheader.h b/nx-X11/extras/Mesa/src/mesa/main/glheader.h
index 90b3a81a4..31c10e3e2 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/glheader.h
+++ b/nx-X11/extras/Mesa/src/mesa/main/glheader.h
@@ -47,11 +47,9 @@
#define GLHEADER_H
-#if defined(XFree86LOADER) && defined(IN_MODULE)
-#include "xf86_ansic.h"
-#else
#include <assert.h>
#include <ctype.h>
+
/* If we can use Compaq's Fast Math Library on Alpha */
#if defined(__alpha__) && defined(CCPML)
#include <cpml.h>
@@ -65,7 +63,7 @@
#if defined(__linux__) && defined(__i386__)
#include <fpu_control.h>
#endif
-#endif
+
#include <float.h>
#include <stdarg.h>
diff --git a/nx-X11/extras/Mesa/src/mesa/main/imports.c b/nx-X11/extras/Mesa/src/mesa/main/imports.c
index 9cdf4e347..1fdfe064a 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/imports.c
+++ b/nx-X11/extras/Mesa/src/mesa/main/imports.c
@@ -81,33 +81,21 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
void *
_mesa_malloc(size_t bytes)
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86malloc(bytes);
-#else
return malloc(bytes);
-#endif
}
/** Wrapper around either calloc() or xf86calloc() */
void *
_mesa_calloc(size_t bytes)
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86calloc(1, bytes);
-#else
return calloc(1, bytes);
-#endif
}
/** Wrapper around either free() or xf86free() */
void
_mesa_free(void *ptr)
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- xf86free(ptr);
-#else
free(ptr);
-#endif
}
/**
@@ -211,9 +199,7 @@ _mesa_realloc(void *oldBuffer, size_t oldSize, size_t newSize)
void *
_mesa_memcpy(void *dest, const void *src, size_t n)
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86memcpy(dest, src, n);
-#elif defined(SUNOS4)
+#if defined(SUNOS4)
return memcpy((char *) dest, (char *) src, (int) n);
#else
return memcpy(dest, src, n);
@@ -224,9 +210,7 @@ _mesa_memcpy(void *dest, const void *src, size_t n)
void
_mesa_memset( void *dst, int val, size_t n )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- xf86memset( dst, val, n );
-#elif defined(SUNOS4)
+#if defined(SUNOS4)
memset( (char *) dst, (int) val, (int) n );
#else
memset(dst, val, n);
@@ -250,9 +234,7 @@ _mesa_memset16( unsigned short *dst, unsigned short val, size_t n )
void
_mesa_bzero( void *dst, size_t n )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- xf86memset( dst, 0, n );
-#elif defined(__FreeBSD__)
+#if defined(__FreeBSD__)
bzero( dst, n );
#else
memset( dst, 0, n );
@@ -270,33 +252,21 @@ _mesa_bzero( void *dst, size_t n )
double
_mesa_sin(double a)
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86sin(a);
-#else
return sin(a);
-#endif
}
/** Wrapper around either cos() or xf86cos() */
double
_mesa_cos(double a)
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86cos(a);
-#else
return cos(a);
-#endif
}
/** Wrapper around either sqrt() or xf86sqrt() */
double
_mesa_sqrtd(double x)
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86sqrt(x);
-#else
return sqrt(x);
-#endif
}
@@ -494,9 +464,6 @@ _mesa_inv_sqrtf(float n)
return x3 * r3;
#endif
-#elif defined(XFree86LOADER) && defined(IN_MODULE)
- return 1.0F / xf86sqrt(n);
-#else
return (float) (1.0 / sqrt(n));
#endif
}
@@ -508,11 +475,7 @@ _mesa_inv_sqrtf(float n)
double
_mesa_pow(double x, double y)
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86pow(x, y);
-#else
return pow(x, y);
-#endif
}
@@ -681,9 +644,7 @@ _mesa_half_to_float(GLhalfARB val)
char *
_mesa_getenv( const char *var )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86getenv(var);
-#elif defined(_XBOX)
+#if defined(_XBOX)
return NULL;
#else
return getenv(var);
@@ -701,77 +662,49 @@ _mesa_getenv( const char *var )
char *
_mesa_strstr( const char *haystack, const char *needle )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86strstr(haystack, needle);
-#else
return strstr(haystack, needle);
-#endif
}
/** Wrapper around either strncat() or xf86strncat() */
char *
_mesa_strncat( char *dest, const char *src, size_t n )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86strncat(dest, src, n);
-#else
return strncat(dest, src, n);
-#endif
}
/** Wrapper around either strcpy() or xf86strcpy() */
char *
_mesa_strcpy( char *dest, const char *src )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86strcpy(dest, src);
-#else
return strcpy(dest, src);
-#endif
}
/** Wrapper around either strncpy() or xf86strncpy() */
char *
_mesa_strncpy( char *dest, const char *src, size_t n )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86strncpy(dest, src, n);
-#else
return strncpy(dest, src, n);
-#endif
}
/** Wrapper around either strlen() or xf86strlen() */
size_t
_mesa_strlen( const char *s )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86strlen(s);
-#else
return strlen(s);
-#endif
}
/** Wrapper around either strcmp() or xf86strcmp() */
int
_mesa_strcmp( const char *s1, const char *s2 )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86strcmp(s1, s2);
-#else
return strcmp(s1, s2);
-#endif
}
/** Wrapper around either strncmp() or xf86strncmp() */
int
_mesa_strncmp( const char *s1, const char *s2, size_t n )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86strncmp(s1, s2, n);
-#else
return strncmp(s1, s2, n);
-#endif
}
/** Implemented using _mesa_malloc() and _mesa_strcpy */
@@ -789,22 +722,14 @@ _mesa_strdup( const char *s )
int
_mesa_atoi(const char *s)
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86atoi(s);
-#else
return atoi(s);
-#endif
}
/** Wrapper around either strtod() or xf86strtod() */
double
_mesa_strtod( const char *s, char **end )
{
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86strtod(s, end);
-#else
return strtod(s, end);
-#endif
}
/*@}*/
@@ -822,11 +747,7 @@ _mesa_sprintf( char *str, const char *fmt, ... )
va_list args;
va_start( args, fmt );
va_end( args );
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- r = xf86vsprintf( str, fmt, args );
-#else
r = vsprintf( str, fmt, args );
-#endif
return r;
}
@@ -840,11 +761,7 @@ _mesa_printf( const char *fmtString, ... )
va_start( args, fmtString );
vsnprintf(s, MAXSTRING, fmtString, args);
va_end( args );
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- xf86printf("%s", s);
-#else
fprintf(stderr,"%s", s);
-#endif
}
/*@}*/
@@ -880,11 +797,7 @@ _mesa_warning( GLcontext *ctx, const char *fmtString, ... )
debug = _mesa_getenv("MESA_DEBUG") ? GL_TRUE : GL_FALSE;
#endif
if (debug) {
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- xf86fprintf(stderr, "Mesa warning: %s", str);
-#else
fprintf(stderr, "Mesa warning: %s", str);
-#endif
}
}
@@ -908,13 +821,8 @@ _mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
vsnprintf( str, MAXSTRING, fmtString, args );
va_end( args );
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- xf86fprintf(stderr, "Mesa %s implementation error: %s\n", MESA_VERSION_STRING, str);
- xf86fprintf(stderr, "Please report at bugzilla.freedesktop.org\n");
-#else
fprintf(stderr, "Mesa %s implementation error: %s\n", MESA_VERSION_STRING, str);
fprintf(stderr, "Please report at bugzilla.freedesktop.org\n");
-#endif
}
/**
@@ -1015,11 +923,7 @@ _mesa_debug( const GLcontext *ctx, const char *fmtString, ... )
va_start(args, fmtString);
vsnprintf(s, MAXSTRING, fmtString, args);
va_end(args);
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- xf86fprintf(stderr, "Mesa: %s", s);
-#else
fprintf(stderr, "Mesa: %s", s);
-#endif
}
/*@}*/
@@ -1050,11 +954,7 @@ static void *
default_realloc(__GLcontext *gc, void *oldAddr, size_t newSize)
{
(void) gc;
-#if defined(XFree86LOADER) && defined(IN_MODULE)
- return xf86realloc(oldAddr, newSize);
-#else
return realloc(oldAddr, newSize);
-#endif
}
/** Wrapper around _mesa_free() */
diff --git a/nx-X11/extras/Mesa/src/mesa/main/imports.h b/nx-X11/extras/Mesa/src/mesa/main/imports.h
index 37e808fc4..7c7a90a74 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/imports.h
+++ b/nx-X11/extras/Mesa/src/mesa/main/imports.h
@@ -217,8 +217,6 @@ typedef union { GLfloat f; GLint i; } fi_type;
***/
#if 0 /* _mesa_sqrtf() not accurate enough - temporarily disabled */
# define SQRTF(X) _mesa_sqrtf(X)
-#elif defined(XFree86LOADER) && defined(IN_MODULE)
-# define SQRTF(X) (float) xf86sqrt((float) (X))
#else
# define SQRTF(X) (float) sqrt((float) (X))
#endif
@@ -265,9 +263,6 @@ static INLINE GLfloat LOG2(GLfloat val)
num.f = ((-1.0f/3) * num.f + 2) * num.f - 2.0f/3;
return num.f + log_2;
}
-#elif defined(XFree86LOADER) && defined(IN_MODULE)
-#define LOG2(x) ((GLfloat) (xf86log(x) * 1.442695))
-#else
/*
* NOTE: log_base_2(x) = log(x) / log(2)
* NOTE: 1.442695 = 1/log(2).
@@ -275,7 +270,6 @@ static INLINE GLfloat LOG2(GLfloat val)
#define LOG2(x) ((GLfloat) (log(x) * 1.442695F))
#endif
-
/***
*** IS_INF_OR_NAN: test if float is infinite or NaN
***/
@@ -337,15 +331,7 @@ static INLINE int GET_FLOAT_BITS( float x )
*** LDEXPF: multiply value by an integral power of two
*** FREXPF: extract mantissa and exponent from value
***/
-#if defined(XFree86LOADER) && defined(IN_MODULE)
-#define CEILF(x) ((GLfloat) xf86ceil(x))
-#define FLOORF(x) ((GLfloat) xf86floor(x))
-#define FABSF(x) ((GLfloat) xf86fabs(x))
-#define LOGF(x) ((GLfloat) xf86log(x))
-#define EXPF(x) ((GLfloat) xf86exp(x))
-#define LDEXPF(x,y) ((GLfloat) xf86ldexp(x,y))
-#define FREXPF(x,y) ((GLfloat) xf86frexp(x,y))
-#elif defined(__gnu_linux__)
+#if defined(__gnu_linux__)
/* C99 functions */
#define CEILF(x) ceilf(x)
#define FLOORF(x) floorf(x)
diff --git a/nx-X11/include/Xfuncs.h b/nx-X11/include/Xfuncs.h
index c00e468ec..3ea09a8b7 100644
--- a/nx-X11/include/Xfuncs.h
+++ b/nx-X11/include/Xfuncs.h
@@ -32,9 +32,6 @@ in this Software without prior written authorization from The Open Group.
#include <nx-X11/Xosdefs.h>
-/* the old Xfuncs.h, for pre-R6 */
-#if !(defined(XFree86LOADER) && defined(IN_MODULE))
-
#ifdef X_USEBFUNCS
void bcopy();
void bzero();
@@ -88,6 +85,4 @@ void bcopy();
#define atexit(f) on_exit(f, 0)
#endif
-#endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
-
#endif /* _XFUNCS_H_ */
diff --git a/nx-X11/programs/Xserver/GL/glx/glxcmds.c b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
index 1145186e7..dd5e40ffe 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxcmds.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
@@ -38,6 +38,8 @@
#include <dix-config.h>
#endif
+#include <string.h>
+
#include "glxserver.h"
#include <GL/glxtokens.h>
#include <unpack.h>
diff --git a/nx-X11/programs/Xserver/GL/glx/glximports.c b/nx-X11/programs/Xserver/GL/glx/glximports.c
index fa930cf5b..a5a5e37ae 100644
--- a/nx-X11/programs/Xserver/GL/glx/glximports.c
+++ b/nx-X11/programs/Xserver/GL/glx/glximports.c
@@ -37,6 +37,10 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
#include "glxserver.h"
#include "glxcontext.h"
#include "glximports.h"
diff --git a/nx-X11/programs/Xserver/GL/glx/glxscreens.c b/nx-X11/programs/Xserver/GL/glx/glxscreens.c
index 88833e154..6b274a64b 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxscreens.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxscreens.c
@@ -37,12 +37,8 @@
#include <dix-config.h>
#endif
-#ifdef IN_MODULE
-#include <xf86_ansic.h>
-#else
#include <string.h>
#include <signal.h>
-#endif
#include <windowstr.h>
diff --git a/nx-X11/programs/Xserver/GL/glx/glxutil.c b/nx-X11/programs/Xserver/GL/glx/glxutil.c
index b8d4874aa..5d40bc832 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxutil.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxutil.c
@@ -38,6 +38,8 @@
#include <dix-config.h>
#endif
+#include <string.h>
+
#include "glxserver.h"
#include <GL/glxtokens.h>
#include <unpack.h>
diff --git a/nx-X11/programs/Xserver/GL/glx/single2.c b/nx-X11/programs/Xserver/GL/glx/single2.c
index d6d689935..d36e57739 100644
--- a/nx-X11/programs/Xserver/GL/glx/single2.c
+++ b/nx-X11/programs/Xserver/GL/glx/single2.c
@@ -37,6 +37,10 @@
#include <dix-config.h>
#endif
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
#include "glxserver.h"
#include "glxutil.h"
#include "glxext.h"
diff --git a/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
index c4e9c01e9..f48ecb8bb 100644
--- a/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
+++ b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
@@ -55,9 +55,6 @@
#ifdef XFree86Server
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
#ifndef assert
#define assert(a)
#endif
@@ -111,4 +108,3 @@
#define __glXAtoi(a) atoi(a)
#endif /* _glx_ansic_h_ */
-
diff --git a/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
index 8a4472874..9e69fac65 100644
--- a/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
+++ b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
@@ -36,7 +36,3 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include "miscstruct.h"
-
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
index 976818f07..d0d8eb239 100644
--- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
+++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
@@ -35,6 +35,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include <gcstruct.h>
#include "pixmapstr.h"
#include "xf86glx_util.h"
diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c
index 0cb71de42..3e4fd8a95 100644
--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/nx-X11/programs/Xserver/Xext/saver.c
@@ -53,11 +53,7 @@ in this Software without prior written authorization from the X Consortium.
#endif
-#ifdef IN_MODULE
-#include <xf86_ansic.h>
-#else
#include <stdio.h>
-#endif
#include "protocol-versions.h"
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 50a6db119..de597dead 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -28,6 +28,8 @@ in this Software without prior written authorization from The Open Group.
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
#include "misc.h"
@@ -43,9 +45,6 @@ in this Software without prior written authorization from The Open Group.
#include "protocol-versions.h"
#include "regionstr.h"
#include "gcstruct.h"
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
typedef RegionPtr (*CreateDftPtr)(
WindowPtr /* pWin */
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index f27d70ffe..c70f52b6a 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -58,9 +58,7 @@ in this Software without prior written authorization from The Open Group.
#define _XSHM_SERVER_
#include <X11/extensions/shmstr.h>
#include <nx-X11/Xfuncproto.h>
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
+
#include "protocol-versions.h"
#ifdef PANORAMIX
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c
index 0421cd9f9..4f24d5b54 100644
--- a/nx-X11/programs/Xserver/Xext/sync.c
+++ b/nx-X11/programs/Xserver/Xext/sync.c
@@ -54,6 +54,8 @@ PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h>
#endif
+#include <string.h>
+
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
#include <nx-X11/Xmd.h>
@@ -68,14 +70,10 @@ PERFORMANCE OF THIS SOFTWARE.
#include <nx-X11/extensions/syncstr.h>
#include "protocol-versions.h"
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#else
#include <stdio.h>
#if !defined(WIN32) && !defined(Lynx)
#include <sys/time.h>
#endif
-#endif
/*
* Local Global Variables
diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c
index c410a4955..d78efd39b 100644
--- a/nx-X11/programs/Xserver/Xext/xtest.c
+++ b/nx-X11/programs/Xserver/Xext/xtest.c
@@ -50,9 +50,6 @@ from The Open Group.
#define EXTENSION_EVENT_BASE 64
#include "extinit.h" /* LookupDeviceIntRec */
#endif /* XINPUT */
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
#if 0
static unsigned char XTestReqCode;
diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c
index 88536b70e..34f4537f2 100644
--- a/nx-X11/programs/Xserver/Xext/xvdisp.c
+++ b/nx-X11/programs/Xserver/Xext/xvdisp.c
@@ -50,6 +50,8 @@ SOFTWARE.
#include <dix-config.h>
#endif
+#include <string.h>
+
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
#include "misc.h"
@@ -69,10 +71,6 @@ SOFTWARE.
#include <X11/extensions/shmproto.h>
#endif
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
-
#include "xvdisp.h"
#ifdef PANORAMIX
diff --git a/nx-X11/programs/Xserver/Xext/xvmain.c b/nx-X11/programs/Xserver/Xext/xvmain.c
index b233299af..3eea84c76 100644
--- a/nx-X11/programs/Xserver/Xext/xvmain.c
+++ b/nx-X11/programs/Xserver/Xext/xvmain.c
@@ -77,6 +77,8 @@ SOFTWARE.
#include <dix-config.h>
#endif
+#include <string.h>
+
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
#include "misc.h"
@@ -97,10 +99,6 @@ SOFTWARE.
#include <nx-X11/extensions/Xvproto.h>
#include "xvdix.h"
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
-
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c
index 0d4849b85..710101d07 100644
--- a/nx-X11/programs/Xserver/Xext/xvmc.c
+++ b/nx-X11/programs/Xserver/Xext/xvmc.c
@@ -3,6 +3,8 @@
#include <dix-config.h>
#endif
+#include <string.h>
+
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
#include "misc.h"
diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c
index 58301e158..d0487ba63 100644
--- a/nx-X11/programs/Xserver/dbe/dbe.c
+++ b/nx-X11/programs/Xserver/dbe/dbe.c
@@ -37,6 +37,8 @@
#include <dix-config.h>
#endif
+#include <string.h>
+
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
#include "scrnintstr.h"
@@ -47,10 +49,6 @@
#include "dbestruct.h"
#include "midbe.h"
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
-
#if !defined(UINT32_MAX)
#define UINT32_MAX 0xffffffffU
#endif
diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c
index 867a11243..bc8dd242e 100644
--- a/nx-X11/programs/Xserver/dbe/midbe.c
+++ b/nx-X11/programs/Xserver/dbe/midbe.c
@@ -54,11 +54,7 @@
#include "gcstruct.h"
#include "inputstr.h"
-#ifndef IN_MODULE
#include <stdio.h>
-#else
-#include "xf86_ansic.h"
-#endif
/* DEFINES */
diff --git a/nx-X11/programs/Xserver/fb/fb24_32.c b/nx-X11/programs/Xserver/fb/fb24_32.c
index 5dc34d7f5..13af3acb2 100644
--- a/nx-X11/programs/Xserver/fb/fb24_32.c
+++ b/nx-X11/programs/Xserver/fb/fb24_32.c
@@ -27,11 +27,7 @@
#include <dix-config.h>
#endif
-#ifdef XFree86LOADER
-#include "xf86.h"
-#include "xf86_ansic.h"
-#endif
-
+#include <string.h>
#include "fb.h"
/* X apps don't like 24bpp images, this code exposes 32bpp images */
diff --git a/nx-X11/programs/Xserver/fb/fbarc.c b/nx-X11/programs/Xserver/fb/fbarc.c
index 0193d2b31..ae89e44d8 100644
--- a/nx-X11/programs/Xserver/fb/fbarc.c
+++ b/nx-X11/programs/Xserver/fb/fbarc.c
@@ -28,9 +28,7 @@
#include "fb.h"
#include "mizerarc.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
+#include <limits.h>
typedef void (*FbArc) (FbBits *dst,
FbStride dstStride,
@@ -99,7 +97,7 @@ fbPolyArc (DrawablePtr pDrawable,
box.x2 = x2;
y2 = box.y1 + (int)parcs->height + 1;
box.y2 = y2;
- if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) &&
+ if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
(RegionContainsRect(cclip, &box) == rgnIN) )
(*arc) (dst, dstStride, dstBpp,
parcs, pDrawable->x + dstXoff, pDrawable->y + dstYoff,
diff --git a/nx-X11/programs/Xserver/fb/fbcompose.c b/nx-X11/programs/Xserver/fb/fbcompose.c
index 07ae9490f..b0b256e47 100644
--- a/nx-X11/programs/Xserver/fb/fbcompose.c
+++ b/nx-X11/programs/Xserver/fb/fbcompose.c
@@ -33,10 +33,14 @@
#ifdef RENDER
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+
#include "picturestr.h"
#include "mipict.h"
#include "fbpict.h"
-#include <math.h>
#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
diff --git a/nx-X11/programs/Xserver/fb/fbcopy.c b/nx-X11/programs/Xserver/fb/fbcopy.c
index 39c75afc5..a0a67950b 100644
--- a/nx-X11/programs/Xserver/fb/fbcopy.c
+++ b/nx-X11/programs/Xserver/fb/fbcopy.c
@@ -26,10 +26,9 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
void
fbCopyNtoN (DrawablePtr pSrcDrawable,
diff --git a/nx-X11/programs/Xserver/fb/fbgc.c b/nx-X11/programs/Xserver/fb/fbgc.c
index fd7636937..437bc5df3 100644
--- a/nx-X11/programs/Xserver/fb/fbgc.c
+++ b/nx-X11/programs/Xserver/fb/fbgc.c
@@ -26,10 +26,9 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
const GCFuncs fbGCFuncs = {
fbValidateGC,
diff --git a/nx-X11/programs/Xserver/fb/fbimage.c b/nx-X11/programs/Xserver/fb/fbimage.c
index c3b0fe3fb..9894faf02 100644
--- a/nx-X11/programs/Xserver/fb/fbimage.c
+++ b/nx-X11/programs/Xserver/fb/fbimage.c
@@ -26,12 +26,9 @@
#include <dix-config.h>
#endif
-#include "fb.h"
-#ifdef XFree86LOADER
-#include "xf86.h"
-#include "xf86_ansic.h"
-#endif
+#include <string.h>
+#include "fb.h"
void
fbPutImage (DrawablePtr pDrawable,
diff --git a/nx-X11/programs/Xserver/fb/fboverlay.c b/nx-X11/programs/Xserver/fb/fboverlay.c
index ac0875016..71a7f30d2 100644
--- a/nx-X11/programs/Xserver/fb/fboverlay.c
+++ b/nx-X11/programs/Xserver/fb/fboverlay.c
@@ -23,11 +23,12 @@
* Author: Keith Packard, SuSE, Inc.
*/
-
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
#include "fboverlay.h"
diff --git a/nx-X11/programs/Xserver/fb/fbpict.c b/nx-X11/programs/Xserver/fb/fbpict.c
index 32b395808..c513b3621 100644
--- a/nx-X11/programs/Xserver/fb/fbpict.c
+++ b/nx-X11/programs/Xserver/fb/fbpict.c
@@ -27,6 +27,8 @@
#include <dix-config.h>
#endif
+#include <string.h>
+
#include "fb.h"
#ifdef RENDER
diff --git a/nx-X11/programs/Xserver/fb/fbpixmap.c b/nx-X11/programs/Xserver/fb/fbpixmap.c
index 599f3b44e..a2b98bc3c 100644
--- a/nx-X11/programs/Xserver/fb/fbpixmap.c
+++ b/nx-X11/programs/Xserver/fb/fbpixmap.c
@@ -26,10 +26,9 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
PixmapPtr
fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
diff --git a/nx-X11/programs/Xserver/fb/fbseg.c b/nx-X11/programs/Xserver/fb/fbseg.c
index 8c50829c5..db3240e1b 100644
--- a/nx-X11/programs/Xserver/fb/fbseg.c
+++ b/nx-X11/programs/Xserver/fb/fbseg.c
@@ -26,6 +26,8 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
#include "miline.h"
diff --git a/nx-X11/programs/Xserver/fb/fbwindow.c b/nx-X11/programs/Xserver/fb/fbwindow.c
index aca49e5b1..c4e28de5b 100644
--- a/nx-X11/programs/Xserver/fb/fbwindow.c
+++ b/nx-X11/programs/Xserver/fb/fbwindow.c
@@ -26,10 +26,9 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
Bool
fbCreateWindow(WindowPtr pWin)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index ae0a9cf3a..7dbcce896 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -233,7 +233,7 @@ NX_DEFINES = \
DEFINES = \
-g $(OS_DEFINES) $(EXT_DEFINES) $(NX_DEFINES) \
- -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI -UXFree86LOADER \
+ -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI \
-DNXAGENT_SERVER \
-DNXAGENT_CONSTRAINCURSOR \
-DNXAGENT_FONTCACHE_SIZE=50 \
diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h
index 3255e2201..27137cd50 100644
--- a/nx-X11/programs/Xserver/include/misc.h
+++ b/nx-X11/programs/Xserver/include/misc.h
@@ -96,11 +96,9 @@ extern unsigned long serverGeneration;
#include <nx-X11/Xdefs.h>
-#ifndef IN_MODULE
#ifndef NULL
#include <stddef.h>
#endif
-#endif
#ifndef MAXSCREENS
#define MAXSCREENS 16
@@ -128,9 +126,7 @@ typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */
typedef struct _xReq *xReqPtr;
#include "os.h" /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */
-#ifndef IN_MODULE
#include <nx-X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
-#endif
#define NullBox ((BoxPtr)0)
#define MILLI_PER_MIN (1000 * 60)
@@ -158,12 +154,10 @@ typedef struct _xReq *xReqPtr;
#define min(a, b) (((a) < (b)) ? (a) : (b))
#define max(a, b) (((a) > (b)) ? (a) : (b))
-#ifndef IN_MODULE
/* abs() is a function, not a macro; include the file declaring
* it in case we haven't done that yet.
*/
#include <stdlib.h>
-#endif /* IN_MODULE */
#ifndef Fabs
#define Fabs(a) ((a) > 0.0 ? (a) : -(a)) /* floating absolute value */
#endif
@@ -179,7 +173,6 @@ typedef struct _xReq *xReqPtr;
*/
#define lowbit(x) ((x) & (~(x) + 1))
-#ifndef IN_MODULE
/* XXX Not for modules */
#include <limits.h>
#if !defined(MAXSHORT) || !defined(MINSHORT) || \
@@ -204,8 +197,6 @@ typedef struct _xReq *xReqPtr;
#include <ctype.h>
#include <stdio.h> /* for fopen, etc... */
-#endif
-
/**
* Calculate the number of bytes needed to hold bits.
* @param bits The minimum number of bits needed.
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h
index 106132b23..268513bfd 100644
--- a/nx-X11/programs/Xserver/include/os.h
+++ b/nx-X11/programs/Xserver/include/os.h
@@ -53,11 +53,7 @@ SOFTWARE.
#define ALLOCATE_LOCAL_FALLBACK(_size) malloc((unsigned long)(_size))
#define DEALLOCATE_LOCAL_FALLBACK(_ptr) free((void *)(_ptr))
#include <nx-X11/Xalloca.h>
-#ifndef IN_MODULE
#include <stdarg.h>
-#else
-#include "xf86_ansic.h"
-#endif
#define NullFID ((FID) 0)
@@ -86,12 +82,10 @@ typedef struct _NewClientRec *NewClientPtr;
#define xnfstrdup(s) XNFstrdup(s)
#endif
-#ifndef IN_MODULE
#ifdef __SCO__
#include <stdio.h>
#endif
#include <string.h>
-#endif
/* have to put $(SIGNAL_DEFINES) in DEFINES in Imakefile to get this right */
#ifdef SIGNALRETURNSINT
@@ -519,7 +513,7 @@ extern void ErrorF(const char *f, ...) _printf_attribute(1,2);
extern void Error(char *str);
extern void LogPrintMarkers(void);
-#if defined(NEED_SNPRINTF) && !defined(IN_MODULE)
+#if defined(NEED_SNPRINTF)
extern int snprintf(char *str, size_t size, const char *format, ...)
_printf_attribute(3,4);
extern int vsnprintf(char *str, size_t size, const char *format, va_list ap);
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index fda19aa59..1d50c9156 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -141,14 +141,12 @@ OBJS = $(CBRT_OBJ) \
* in order to build the XInputExtension, since we
* don't use the XF86 module loader.
*/
-
EXT_DEFINES = ExtensionDefines \
- -UXFree86LOADER
-
+ $(NULL)
#else
-
-EXT_DEFINES = ExtensionDefines -UXINPUT \
- -UXFree86LOADER
+EXT_DEFINES = ExtensionDefines \
+ -UXINPUT \
+ $(NULL)
#endif
#endif
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index b48ed8a1c..fc64937d7 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -146,12 +146,8 @@ extern Bool noXIdleExtension;
extern Bool noXvExtension;
#endif
-#ifndef XFree86LOADER
#define INITARGS void
typedef void (*InitExtension)(void);
-#else /* XFree86Loader */
-#include "loaderProcs.h"
-#endif
#ifdef MITSHM
#define _XSHM_SERVER_
@@ -380,8 +376,6 @@ void EnableDisableExtensionError(char *name, Bool enable)
ErrorF(" %s\n", ext->name);
}
-#ifndef XFree86LOADER
-
/*ARGSUSED*/
void
InitExtensions(argc, argv)
@@ -496,101 +490,3 @@ InitVisualWrap()
#endif
}
-#else /* XFree86LOADER */
-/* List of built-in (statically linked) extensions */
-static ExtensionModule staticExtensions[] = {
-#ifdef XTESTEXT1
- { XTestExtension1Init, "XTEST1", &noTestExtensions, NULL, NULL },
-#endif
-#ifdef MITSHM
- { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
-#endif
-#ifdef XINPUT
- { XInputExtensionInit, "XInputExtension", &noXInputExtension, NULL, NULL },
-#endif
-#ifdef XTEST
- { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
-#endif
-#ifdef XIDLE
- { XIdleExtensionInit, "XIDLE", &noXIdleExtension, NULL, NULL },
-#endif
-#ifdef XKB
- { XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL },
-#endif
-#ifdef XCSECURITY
- { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
-#endif
-#ifdef PANORAMIX
- { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
-#endif
-#ifdef XFIXES
- /* must be before Render to layer DisplayCursor correctly */
- { XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL, NULL },
-#endif
-#ifdef XF86BIGFONT
- { XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL, NULL },
-#endif
-#ifdef RENDER
- { RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL },
-#endif
-#ifdef RANDR
- { RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL },
-#endif
-#ifdef COMPOSITE
- { CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
-#endif
-#ifdef DAMAGE
- { DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL },
-#endif
- { NULL, NULL, NULL, NULL, NULL }
-};
-
-/*ARGSUSED*/
-void
-InitExtensions(argc, argv)
- int argc;
- char *argv[];
-{
- int i;
- ExtensionModule *ext;
- static Bool listInitialised = FALSE;
-
- if (!listInitialised) {
- /* Add built-in extensions to the list. */
- for (i = 0; staticExtensions[i].name; i++)
- LoadExtension(&staticExtensions[i], TRUE);
-
- /* Sort the extensions according the init dependencies. */
- LoaderSortExtensions();
- listInitialised = TRUE;
- }
-
- for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
- ext = &ExtensionModuleList[i];
- if (ext->initFunc != NULL &&
- (ext->disablePtr == NULL ||
- (ext->disablePtr != NULL && !*ext->disablePtr))) {
- (ext->initFunc)();
- }
- }
-}
-
-static void (*__miHookInitVisualsFunction)(miInitVisualsProcPtr *);
-
-void
-InitVisualWrap()
-{
- miResetInitVisuals();
- if (__miHookInitVisualsFunction)
- (*__miHookInitVisualsFunction)(&miInitVisualsProc);
-}
-
-void miHookInitVisuals(void (**old)(miInitVisualsProcPtr *),
- void (*new)(miInitVisualsProcPtr *))
-{
- if (old)
- *old = __miHookInitVisualsFunction;
- __miHookInitVisualsFunction = new;
-}
-
-#endif /* XFree86LOADER */
diff --git a/nx-X11/programs/Xserver/miext/cw/cw.c b/nx-X11/programs/Xserver/miext/cw/cw.c
index 8aca3edf7..774f0d056 100644
--- a/nx-X11/programs/Xserver/miext/cw/cw.c
+++ b/nx-X11/programs/Xserver/miext/cw/cw.c
@@ -25,6 +25,8 @@
#include <dix-config.h>
#endif
+#include <string.h>
+
#include "gcstruct.h"
#include "windowstr.h"
#include "cw.h"
diff --git a/nx-X11/programs/Xserver/miext/cw/cw_ops.c b/nx-X11/programs/Xserver/miext/cw/cw_ops.c
index e4c53b79f..826a0eeca 100644
--- a/nx-X11/programs/Xserver/miext/cw/cw_ops.c
+++ b/nx-X11/programs/Xserver/miext/cw/cw_ops.c
@@ -25,6 +25,8 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "gcstruct.h"
#include "cw.h"
diff --git a/nx-X11/programs/Xserver/miext/cw/cw_render.c b/nx-X11/programs/Xserver/miext/cw/cw_render.c
index ac4230a03..504d7bda3 100644
--- a/nx-X11/programs/Xserver/miext/cw/cw_render.c
+++ b/nx-X11/programs/Xserver/miext/cw/cw_render.c
@@ -25,6 +25,8 @@
#include <dix-config.h>
#endif
+#include <string.h>
+
#include "gcstruct.h"
#include "windowstr.h"
#include "cw.h"
diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c
index 669f08ff5..a56b9877e 100644
--- a/nx-X11/programs/Xserver/miext/damage/damage.c
+++ b/nx-X11/programs/Xserver/miext/damage/damage.c
@@ -26,6 +26,8 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include <nx-X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c
index f4b7abae0..5f097f89a 100644
--- a/nx-X11/programs/Xserver/os/osinit.c
+++ b/nx-X11/programs/Xserver/os/osinit.c
@@ -92,10 +92,6 @@ int limitNoFile = -1;
Bool OsDelayInitColors = FALSE;
-#ifdef XFree86LOADER
-extern void xf86WrapperInit(void);
-#endif
-
void
OsInit(void)
{
@@ -109,9 +105,6 @@ OsInit(void)
#endif
if (!been_here) {
-#ifdef XFree86LOADER
- xf86WrapperInit();
-#endif
#if !defined(__SCO__) && !defined(__CYGWIN__) && !defined(__UNIXWARE__)
fclose(stdin);
fclose(stdout);
diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c
index 33bdf56ec..eb9212f40 100644
--- a/nx-X11/programs/Xserver/record/record.c
+++ b/nx-X11/programs/Xserver/record/record.c
@@ -42,12 +42,8 @@ and Jim Haggerty of Metheus.
#include <nx-X11/extensions/recordstr.h>
#include "set.h"
-#ifndef XFree86LOADER
#include <stdio.h>
#include <assert.h>
-#else
-#include "xf86_ansic.h"
-#endif
#ifdef PANORAMIX
#include "globals.h"
diff --git a/nx-X11/programs/Xserver/record/set.c b/nx-X11/programs/Xserver/record/set.c
index 07d911c8c..1ea3fea4a 100644
--- a/nx-X11/programs/Xserver/record/set.c
+++ b/nx-X11/programs/Xserver/record/set.c
@@ -53,12 +53,13 @@ from The Open Group.
#include <dix-config.h>
#endif
+#include <string.h>
+
#ifndef TESTING
#include "misc.h"
#else
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
/* stuff that you normally get from the X Server's environment */
@@ -81,11 +82,6 @@ typedef unsigned short CARD16;
#include "set.h"
-#ifdef XFree86LOADER
-#include "xf86_libc.h"
-#include "xf86_ansic.h"
-#endif
-
static int
maxMemberInInterval(pIntervals, nIntervals)
RecordSetInterval *pIntervals;
diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c
index 2eba16a4e..774dcc8ec 100644
--- a/nx-X11/programs/Xserver/render/render.c
+++ b/nx-X11/programs/Xserver/render/render.c
@@ -45,9 +45,6 @@
#include "glyphstr.h"
#include <nx-X11/Xfuncproto.h>
#include "cursorstr.h"
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
#include "protocol-versions.h"