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/GL/glx | |
| 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/GL/glx')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glxcmds.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glximports.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glxscreens.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glxutil.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/single2.c | 4 |
5 files changed, 12 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/glxcmds.c b/nx-X11/programs/Xserver/GL/glx/glxcmds.c index 1145186e7..dd5e40ffe 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxcmds.c +++ b/nx-X11/programs/Xserver/GL/glx/glxcmds.c @@ -38,6 +38,8 @@ #include <dix-config.h> #endif +#include <string.h> + #include "glxserver.h" #include <GL/glxtokens.h> #include <unpack.h> diff --git a/nx-X11/programs/Xserver/GL/glx/glximports.c b/nx-X11/programs/Xserver/GL/glx/glximports.c index fa930cf5b..a5a5e37ae 100644 --- a/nx-X11/programs/Xserver/GL/glx/glximports.c +++ b/nx-X11/programs/Xserver/GL/glx/glximports.c @@ -37,6 +37,10 @@ #include <dix-config.h> #endif +#include <stdlib.h> +#include <stdio.h> +#include <string.h> + #include "glxserver.h" #include "glxcontext.h" #include "glximports.h" diff --git a/nx-X11/programs/Xserver/GL/glx/glxscreens.c b/nx-X11/programs/Xserver/GL/glx/glxscreens.c index 88833e154..6b274a64b 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxscreens.c +++ b/nx-X11/programs/Xserver/GL/glx/glxscreens.c @@ -37,12 +37,8 @@ #include <dix-config.h> #endif -#ifdef IN_MODULE -#include <xf86_ansic.h> -#else #include <string.h> #include <signal.h> -#endif #include <windowstr.h> diff --git a/nx-X11/programs/Xserver/GL/glx/glxutil.c b/nx-X11/programs/Xserver/GL/glx/glxutil.c index b8d4874aa..5d40bc832 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxutil.c +++ b/nx-X11/programs/Xserver/GL/glx/glxutil.c @@ -38,6 +38,8 @@ #include <dix-config.h> #endif +#include <string.h> + #include "glxserver.h" #include <GL/glxtokens.h> #include <unpack.h> diff --git a/nx-X11/programs/Xserver/GL/glx/single2.c b/nx-X11/programs/Xserver/GL/glx/single2.c index d6d689935..d36e57739 100644 --- a/nx-X11/programs/Xserver/GL/glx/single2.c +++ b/nx-X11/programs/Xserver/GL/glx/single2.c @@ -37,6 +37,10 @@ #include <dix-config.h> #endif +#include <string.h> +#include <stdio.h> +#include <stdlib.h> + #include "glxserver.h" #include "glxutil.h" #include "glxext.h" |