aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2016-10-29 11:28:02 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-12-04 21:11:41 +0100
commit508d2deae98846111299a3693033a507010e3c91 (patch)
treeee0d60bb4a9c500f6072891a7802fd06be15ce8a /nx-X11/programs/Xserver/include
parent62f8e50e7a5ddc6952a951edc37ee53c2a828675 (diff)
downloadnx-libs-508d2deae98846111299a3693033a507010e3c91.tar.gz
nx-libs-508d2deae98846111299a3693033a507010e3c91.tar.bz2
nx-libs-508d2deae98846111299a3693033a507010e3c91.zip
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 <anholt@freebsd.org> 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 <mike.gabriel@das-netzwerkteam.de> Fixes ArcticaProject/nx-libs#246 (together with merge commit ecd335fa61551d0b86d3f075469a7743ab899d95).
Diffstat (limited to 'nx-X11/programs/Xserver/include')
-rw-r--r--nx-X11/programs/Xserver/include/misc.h9
-rw-r--r--nx-X11/programs/Xserver/include/os.h8
2 files changed, 1 insertions, 16 deletions
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);