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/record/record.c | 4 ---- nx-X11/programs/Xserver/record/set.c | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'nx-X11/programs/Xserver/record') 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 #include "set.h" -#ifndef XFree86LOADER #include #include -#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 #endif +#include + #ifndef TESTING #include "misc.h" #else #include #include -#include /* 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; -- cgit v1.2.3