diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-04-20 16:40:52 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-04-20 16:40:52 +0000 |
| commit | db5bd04097fd815ab6523f187679682a5e5047fa (patch) | |
| tree | d15b3a34aa3389d074e5dbc6e620e5d0befc1026 | |
| parent | 8963a220f36cf0ae2a8a653fd39c983140e29736 (diff) | |
Fix includes right throughout the Xserver tree:
apply changes to windows specific includes
Fix includes right throughout the Xserver tree:
apply changes to Xdmcp.h
| -rw-r--r-- | GL/windows/glwindows.h | 2 | ||||
| -rwxr-xr-x | GL/windows/glwrap.c | 2 | ||||
| -rw-r--r-- | os/auth.c | 2 | ||||
| -rw-r--r-- | os/xdmauth.c | 2 | ||||
| -rw-r--r-- | os/xdmcp.c | 4 | ||||
| -rw-r--r-- | xkb/ddxLoad.c | 6 |
6 files changed, 9 insertions, 9 deletions
diff --git a/GL/windows/glwindows.h b/GL/windows/glwindows.h index b0e83d077..0e269a119 100644 --- a/GL/windows/glwindows.h +++ b/GL/windows/glwindows.h @@ -1,4 +1,4 @@ -#include <Xwindows.h> +#include <X11/Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> diff --git a/GL/windows/glwrap.c b/GL/windows/glwrap.c index 656edc131..646675765 100755 --- a/GL/windows/glwrap.c +++ b/GL/windows/glwrap.c @@ -5,7 +5,7 @@ * Authors: Alexander Gottwald */ -#include <Xwindows.h> +#include <X11/Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> #include <glxserver.h> @@ -48,7 +48,7 @@ from The Open Group. # include <X11/extensions/security.h> #endif #ifdef WIN32 -#include "Xw32defs.h" +#include <X11/Xw32defs.h> #endif struct protocol { diff --git a/os/xdmauth.c b/os/xdmauth.c index 1d4a7d2c3..1468dfeb7 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -49,7 +49,7 @@ static Bool authFromXDMCP; #ifdef XDMCP #include <X11/Xmd.h> #undef REQUEST -#include "Xdmcp.h" +#include <X11/Xdmcp.h> /* XDM-AUTHENTICATION-1 */ diff --git a/os/xdmcp.c b/os/xdmcp.c index 82e2f297c..23b25953f 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.4 2004/11/15 15:06:50 ago Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.5 2005/04/20 12:25:47 daniels Exp $ */ /* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */ /* * Copyright 1989 Network Computing Devices, Inc., Mountain View, California. @@ -17,7 +17,7 @@ /* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */ #ifdef WIN32 -#include <Xwinsock.h> +#include <X11/Xwinsock.h> #endif #include <X11/Xos.h> diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index c2b1f18ee..5ad593f4c 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -79,7 +79,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef WIN32 -#include <Xwindows.h> +#include <X11/Xwindows.h> const char* Win32TempDir() { @@ -139,12 +139,12 @@ Win32System(const char *cmdline) xfree(cmd); return -1; } - // Wait until child process exits. + /* Wait until child process exits. */ WaitForSingleObject( pi.hProcess, INFINITE ); GetExitCodeProcess( pi.hProcess, &dwExitCode); - // Close process and thread handles. + /* Close process and thread handles. */ CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); xfree(cmd); |