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/dbe | |
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/dbe')
-rw-r--r-- | nx-X11/programs/Xserver/dbe/dbe.c | 6 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/dbe/midbe.c | 4 |
2 files changed, 2 insertions, 8 deletions
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 */ |