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/Xext/sync.c | |
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/Xext/sync.c')
-rw-r--r-- | nx-X11/programs/Xserver/Xext/sync.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index 0421cd9f9..4f24d5b54 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -54,6 +54,8 @@ PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <nx-X11/X.h> #include <nx-X11/Xproto.h> #include <nx-X11/Xmd.h> @@ -68,14 +70,10 @@ PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/extensions/syncstr.h> #include "protocol-versions.h" -#ifdef EXTMODULE -#include "xf86_ansic.h" -#else #include <stdio.h> #if !defined(WIN32) && !defined(Lynx) #include <sys/time.h> #endif -#endif /* * Local Global Variables |