diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:14:24 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:14:24 +0100 |
| commit | b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9 (patch) | |
| tree | ee0d60bb4a9c500f6072891a7802fd06be15ce8a /nx-X11/programs/Xserver/record | |
| parent | 62f8e50e7a5ddc6952a951edc37ee53c2a828675 (diff) | |
| parent | 508d2deae98846111299a3693033a507010e3c91 (diff) | |
| download | nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.tar.gz nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.tar.bz2 nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.zip | |
Merge branch 'sunweaver-pr/extmod-xfree86loader-cleanup' into 3.6.x
Attributes GH PR #251: https://github.com/ArcticaProject/nx-libs/pull/251
Diffstat (limited to 'nx-X11/programs/Xserver/record')
| -rw-r--r-- | nx-X11/programs/Xserver/record/record.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/record/set.c | 8 |
2 files changed, 2 insertions, 10 deletions
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; |