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
This commit is contained in:
Alexander Gottwald 2005-04-20 16:40:52 +00:00
parent 8963a220f3
commit db5bd04097
6 changed files with 9 additions and 9 deletions

View File

@ -1,4 +1,4 @@
#include <Xwindows.h> #include <X11/Xwindows.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glext.h> #include <GL/glext.h>

View File

@ -5,7 +5,7 @@
* Authors: Alexander Gottwald * Authors: Alexander Gottwald
*/ */
#include <Xwindows.h> #include <X11/Xwindows.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glext.h> #include <GL/glext.h>
#include <glxserver.h> #include <glxserver.h>

View File

@ -48,7 +48,7 @@ from The Open Group.
# include <X11/extensions/security.h> # include <X11/extensions/security.h>
#endif #endif
#ifdef WIN32 #ifdef WIN32
#include "Xw32defs.h" #include <X11/Xw32defs.h>
#endif #endif
struct protocol { struct protocol {

View File

@ -49,7 +49,7 @@ static Bool authFromXDMCP;
#ifdef XDMCP #ifdef XDMCP
#include <X11/Xmd.h> #include <X11/Xmd.h>
#undef REQUEST #undef REQUEST
#include "Xdmcp.h" #include <X11/Xdmcp.h>
/* XDM-AUTHENTICATION-1 */ /* XDM-AUTHENTICATION-1 */

View File

@ -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 $ */ /* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */
/* /*
* Copyright 1989 Network Computing Devices, Inc., Mountain View, California. * 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 $ */ /* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */
#ifdef WIN32 #ifdef WIN32
#include <Xwinsock.h> #include <X11/Xwinsock.h>
#endif #endif
#include <X11/Xos.h> #include <X11/Xos.h>

View File

@ -79,7 +79,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef WIN32 #ifdef WIN32
#include <Xwindows.h> #include <X11/Xwindows.h>
const char* const char*
Win32TempDir() Win32TempDir()
{ {
@ -139,12 +139,12 @@ Win32System(const char *cmdline)
xfree(cmd); xfree(cmd);
return -1; return -1;
} }
// Wait until child process exits. /* Wait until child process exits. */
WaitForSingleObject( pi.hProcess, INFINITE ); WaitForSingleObject( pi.hProcess, INFINITE );
GetExitCodeProcess( pi.hProcess, &dwExitCode); GetExitCodeProcess( pi.hProcess, &dwExitCode);
// Close process and thread handles. /* Close process and thread handles. */
CloseHandle( pi.hProcess ); CloseHandle( pi.hProcess );
CloseHandle( pi.hThread ); CloseHandle( pi.hThread );
xfree(cmd); xfree(cmd);