From 508d2deae98846111299a3693033a507010e3c91 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 29 Oct 2016 11:28:02 +0200 Subject: Remove libcwrapper usage from xorg server modules. The libcwrapper is not used in nxagent. From c3d14036729fd186d4ec7ca1de603e1f2d174e2f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 10 Feb 2006 22:00:30 +0000 Subject: Remove libcwrapper usage from xorg server modules. The libcwrapper is only of (marginal) use in the drivers, and that usage remains. Backported-to-NX-by: Mike Gabriel Fixes ArcticaProject/nx-libs#246 (together with merge commit ecd335fa61551d0b86d3f075469a7743ab899d95). --- nx-X11/programs/Xserver/include/os.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'nx-X11/programs/Xserver/include/os.h') 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 -#ifndef IN_MODULE #include -#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 #endif #include -#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); -- cgit v1.2.3