From 508cdb5cb01a91b1bf3ef31da80b6b1d36286bf0 Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Mon, 4 Jul 2005 22:10:43 +0000 Subject: [PATCH] Include xwin-config.h if HAVE_XWIN_CONFIG is defined Cleanup X11 includes handling Warning fixes --- hw/xwin/ChangeLog | 7 ++++++ hw/xwin/InitInput.c | 3 +++ hw/xwin/InitOutput.c | 36 +++++++++++++++++++++++++------ hw/xwin/win.h | 4 ++-- hw/xwin/winallpriv.c | 3 +++ hw/xwin/winauth.c | 3 +++ hw/xwin/winblock.c | 3 +++ hw/xwin/winclip.c | 3 +++ hw/xwin/winclipboardinit.c | 3 +++ hw/xwin/winclipboardtextconv.c | 3 +++ hw/xwin/winclipboardthread.c | 4 ++++ hw/xwin/winclipboardunicode.c | 3 +++ hw/xwin/winclipboardwndproc.c | 5 +++++ hw/xwin/winclipboardwrappers.c | 3 +++ hw/xwin/winclipboardxevents.c | 3 +++ hw/xwin/wincmap.c | 3 +++ hw/xwin/winconfig.c | 5 +++++ hw/xwin/wincreatewnd.c | 3 +++ hw/xwin/wincursor.c | 3 +++ hw/xwin/windialogs.c | 3 +++ hw/xwin/winengine.c | 3 +++ hw/xwin/winerror.c | 9 ++++++++ hw/xwin/winfillsp.c | 3 +++ hw/xwin/winfont.c | 5 +++++ hw/xwin/wingc.c | 4 +++- hw/xwin/wingetsp.c | 3 +++ hw/xwin/winglobals.c | 3 +++ hw/xwin/winkeybd.c | 5 +++++ hw/xwin/winkeyhook.c | 3 +++ hw/xwin/winkeynames.h | 2 +- hw/xwin/winmisc.c | 3 +++ hw/xwin/winmouse.c | 3 +++ hw/xwin/winms.h | 2 +- hw/xwin/winmsg.c | 3 +++ hw/xwin/winmultiwindowclass.c | 3 +++ hw/xwin/winmultiwindowicons.c | 3 +++ hw/xwin/winmultiwindowshape.c | 3 +++ hw/xwin/winmultiwindowwindow.c | 3 +++ hw/xwin/winmultiwindowwm.c | 7 ++++++ hw/xwin/winmultiwindowwndproc.c | 3 +++ hw/xwin/winnativegdi.c | 3 +++ hw/xwin/winpfbdd.c | 3 +++ hw/xwin/winpixmap.c | 3 +++ hw/xwin/winpntwin.c | 3 +++ hw/xwin/winpolyline.c | 3 +++ hw/xwin/winprefs.c | 5 ++++- hw/xwin/winprefs.h | 2 +- hw/xwin/winprefsyacc.y | 3 +++ hw/xwin/winpriv.c | 3 +++ hw/xwin/winprocarg.c | 10 ++++++++- hw/xwin/winpushpxl.c | 3 +++ hw/xwin/winrandr.c | 3 +++ hw/xwin/winregistry.c | 3 +++ hw/xwin/winrop.c | 3 +++ hw/xwin/winscrinit.c | 3 +++ hw/xwin/winsetsp.c | 3 +++ hw/xwin/winshaddd.c | 3 +++ hw/xwin/winshadddnl.c | 3 +++ hw/xwin/winshadgdi.c | 3 +++ hw/xwin/wintrayicon.c | 5 ++++- hw/xwin/winvalargs.c | 3 +++ hw/xwin/winvideo.c | 3 +++ hw/xwin/winwakeup.c | 3 +++ hw/xwin/winwin32rootless.c | 3 +++ hw/xwin/winwin32rootlesswindow.c | 3 +++ hw/xwin/winwin32rootlesswndproc.c | 3 +++ hw/xwin/winwindow.c | 3 +++ hw/xwin/winwindowswm.c | 3 +++ hw/xwin/winwndproc.c | 3 +++ 69 files changed, 258 insertions(+), 15 deletions(-) diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog index 993313fa04..b9f521cb31 100644 --- a/hw/xwin/ChangeLog +++ b/hw/xwin/ChangeLog @@ -1,3 +1,10 @@ +2005-07-05 Alexander Gottwald + + * *.c: + Include xwin-config.h if HAVE_XWIN_CONFIG is defined + Cleanup X11 includes handling + Warning fixes + 2005-06-30 Alexander Gottwald * winmultiwindowwndproc.c: diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c index e2277e45ff..8b72416ab3 100644 --- a/hw/xwin/InitInput.c +++ b/hw/xwin/InitInput.c @@ -28,6 +28,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.11 2002/07/05 09:19:25 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #ifdef XWIN_CLIPBOARD # include "../../Xext/xf86miscproc.h" diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 69bdbdc6ab..ffa3e8596e 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -28,6 +28,9 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.34 2003/10/02 13:30:09 eich Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winmsg.h" #include "winconfig.h" @@ -35,6 +38,9 @@ from The Open Group. #ifdef XWIN_CLIPBOARD #include "X11/Xlocale.h" #endif +#ifdef DPMSExtension +#include "dpmsproc.h" +#endif #ifdef __CYGWIN__ #include #endif @@ -123,7 +129,6 @@ winLogVersionInfo (void); Bool winValidateArgs (void); - /* * For the depth 24 pixmap we default to 32 bits per pixel, but * we change this pixmap format later if we detect that the display @@ -285,7 +290,7 @@ AbortDDX (void) #ifdef __CYGWIN__ /* hasmntopt is currently not implemented for cygwin */ -const char *winCheckMntOpt(const struct mntent *mnt, const char *opt) +static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt) { const char *s; size_t len; @@ -305,7 +310,7 @@ const char *winCheckMntOpt(const struct mntent *mnt, const char *opt) return NULL; } -void +static void winCheckMount(void) { FILE *mnt; @@ -367,13 +372,14 @@ winCheckMount(void) winMsg(X_WARNING, "/tmp mounted int textmode\n"); } #else -void +static void winCheckMount(void) { } #endif -const char * +#ifdef RELOCATE_PROJECTROOT +static const char * winGetBaseDir(void) { static BOOL inited = FALSE; @@ -400,6 +406,7 @@ winGetBaseDir(void) } return buffer; } +#endif static void winFixupPaths (void) @@ -749,7 +756,7 @@ OsVendorInit (void) } -void +static void winUseMsg (void) { ErrorF ("-depth bits_per_pixel\n" @@ -1141,3 +1148,20 @@ winCheckDisplayNumber () return TRUE; } + +#ifdef DPMSExtension +Bool DPMSSupported(void) +{ + return FALSE; +} + +void DPMSSet(int level) +{ + return; +} + +int DPMSGet(int *plevel) +{ + return 0; +} +#endif diff --git a/hw/xwin/win.h b/hw/xwin/win.h index eb97a78e9a..9baee9b05d 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -963,10 +963,10 @@ winSendKeyEvent (DWORD dwKey, Bool fDown); */ Bool -winInstallKeyboardHookLL (); +winInstallKeyboardHookLL (void); void -winRemoveKeyboardHookLL (); +winRemoveKeyboardHookLL (void); /* diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c index 2c85645c72..7b4814b9ba 100644 --- a/hw/xwin/winallpriv.c +++ b/hw/xwin/winallpriv.c @@ -30,6 +30,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.11 2002/10/17 08:18:21 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c index 596c08eb48..3d24ef4265 100644 --- a/hw/xwin/winauth.c +++ b/hw/xwin/winauth.c @@ -1,3 +1,6 @@ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #if defined(XCSECURITY) /* *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved. diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c index 1d21faf464..abea60e0f4 100644 --- a/hw/xwin/winblock.c +++ b/hw/xwin/winblock.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winmsg.h" diff --git a/hw/xwin/winclip.c b/hw/xwin/winclip.c index f7de6265fe..aab7d632db 100644 --- a/hw/xwin/winclip.c +++ b/hw/xwin/winclip.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" /* Look at mfb/mfbclip.c for sample implementation */ diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c index 01a56cdf02..6a0cbaf2c4 100644 --- a/hw/xwin/winclipboardinit.c +++ b/hw/xwin/winclipboardinit.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "dixstruct.h" #include "winclipboard.h" diff --git a/hw/xwin/winclipboardtextconv.c b/hw/xwin/winclipboardtextconv.c index c657428f82..fd2e696c3c 100644 --- a/hw/xwin/winclipboardtextconv.c +++ b/hw/xwin/winclipboardtextconv.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include #include diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c index a1f73ed822..081abd5e7a 100644 --- a/hw/xwin/winclipboardthread.c +++ b/hw/xwin/winclipboardthread.c @@ -28,6 +28,10 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif +#include #include "winclipboard.h" #ifdef __CYGWIN__ #include diff --git a/hw/xwin/winclipboardunicode.c b/hw/xwin/winclipboardunicode.c index 48a10fdba1..ba86915a47 100644 --- a/hw/xwin/winclipboardunicode.c +++ b/hw/xwin/winclipboardunicode.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "winclipboard.h" diff --git a/hw/xwin/winclipboardwndproc.c b/hw/xwin/winclipboardwndproc.c index 249f64b593..a006b46d31 100644 --- a/hw/xwin/winclipboardwndproc.c +++ b/hw/xwin/winclipboardwndproc.c @@ -28,6 +28,11 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif +#include +#include #include "winclipboard.h" diff --git a/hw/xwin/winclipboardwrappers.c b/hw/xwin/winclipboardwrappers.c index c990e7ec7d..8801f6c42b 100755 --- a/hw/xwin/winclipboardwrappers.c +++ b/hw/xwin/winclipboardwrappers.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "dixstruct.h" #include diff --git a/hw/xwin/winclipboardxevents.c b/hw/xwin/winclipboardxevents.c index 6a6d8ad2ed..d4c617bec0 100644 --- a/hw/xwin/winclipboardxevents.c +++ b/hw/xwin/winclipboardxevents.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "winclipboard.h" diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c index 3dd5b9d3fc..b3b99b1b51 100644 --- a/hw/xwin/wincmap.c +++ b/hw/xwin/wincmap.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.9 2002/07/05 09:19:26 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index 1764dd3d5f..917ce08c04 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -29,13 +29,18 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winconfig.h" #include "winmsg.h" #include "globals.h" #ifdef XKB +#ifndef XKB_IN_SERVER #define XKB_IN_SERVER +#endif #include #endif diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index 613111d1c2..7c93e40632 100644 --- a/hw/xwin/wincreatewnd.c +++ b/hw/xwin/wincreatewnd.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "shellapi.h" diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c index 40ffe73643..5a619922aa 100644 --- a/hw/xwin/wincursor.c +++ b/hw/xwin/wincursor.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.5 2002/07/05 09:19:26 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winmsg.h" #include diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c index 676b2dfd71..ab06b0d001 100755 --- a/hw/xwin/windialogs.c +++ b/hw/xwin/windialogs.c @@ -29,6 +29,9 @@ * Earle F. Philhower III */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #ifdef __CYGWIN__ #include diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c index c7eb1285b5..f0bc671e2d 100644 --- a/hw/xwin/winengine.c +++ b/hw/xwin/winengine.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winmsg.h" diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index 696142ed2f..7d292134f0 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -28,6 +28,15 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif +#ifdef XVENDORNAME +#define VENDOR_STRING XVENDORNAME +#define VERSION_STRING XORG_RELEASE +#define VENDOR_CONTACT BUILDERADDR +#endif + #include "win.h" /* References to external symbols */ diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c index b0633fa7ab..43ccde67ce 100644 --- a/hw/xwin/winfillsp.c +++ b/hw/xwin/winfillsp.c @@ -30,6 +30,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.9 2001/11/01 12:19:40 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winfont.c b/hw/xwin/winfont.c index 64c6cd2330..af3e90da59 100644 --- a/hw/xwin/winfont.c +++ b/hw/xwin/winfont.c @@ -28,8 +28,12 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" +#ifdef XWIN_NATIVEGDI /* See Porting Layer Definition - p. 32 */ /* See mfb/mfbfont.c - mfbRealizeFont() - which is empty :) */ Bool @@ -73,3 +77,4 @@ winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont) #endif return TRUE; } +#endif diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c index e664da1bc8..3f661d520f 100644 --- a/hw/xwin/wingc.c +++ b/hw/xwin/wingc.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" void @@ -230,7 +233,6 @@ winDestroyGCNativeGDI (GCPtr pGC) winSetGCPriv (pGC, NULL); } - #if 0 /* See Porting Layer Definition - p. 46 */ static void diff --git a/hw/xwin/wingetsp.c b/hw/xwin/wingetsp.c index 79dc5eb531..ec9d51a177 100644 --- a/hw/xwin/wingetsp.c +++ b/hw/xwin/wingetsp.c @@ -30,6 +30,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.7 2001/11/01 12:19:40 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" /* See Porting Layer Definition - p. 55 */ diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c index 53fc02fa54..af8190d3f3 100644 --- a/hw/xwin/winglobals.c +++ b/hw/xwin/winglobals.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index bdd48c83f5..4b87340bc0 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -33,13 +33,18 @@ /* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.12 2002/10/17 08:18:22 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winkeybd.h" #include "winconfig.h" #include "winmsg.h" #ifdef XKB +#ifndef XKB_IN_SERVER #define XKB_IN_SERVER +#endif #include #endif diff --git a/hw/xwin/winkeyhook.c b/hw/xwin/winkeyhook.c index cd54af23bc..53d91e6eea 100755 --- a/hw/xwin/winkeyhook.c +++ b/hw/xwin/winkeyhook.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h index ed075dea59..f3af1907e6 100755 --- a/hw/xwin/winkeynames.h +++ b/hw/xwin/winkeynames.h @@ -27,7 +27,7 @@ #define XK_TECHNICAL #define XK_KATAKANA -#include "keysym.h" +#include #define GLYPHS_PER_KEY 4 #define NUM_KEYCODES 248 diff --git a/hw/xwin/winmisc.c b/hw/xwin/winmisc.c index a116043a81..8e66981185 100644 --- a/hw/xwin/winmisc.c +++ b/hw/xwin/winmisc.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #ifdef XWIN_NATIVEGDI diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c index 93b38acd48..818652da67 100644 --- a/hw/xwin/winmouse.c +++ b/hw/xwin/winmouse.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.3 2001/05/08 08:14:09 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #if defined(XFree86Server) && defined(XINPUT) diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h index f3efecd5d7..1ad30dc0b4 100644 --- a/hw/xwin/winms.h +++ b/hw/xwin/winms.h @@ -36,7 +36,7 @@ #define WIN32_LEAN_AND_MEAN #endif -#include +#include #include #include "ddraw.h" diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c index 8b62d861d6..53974101ea 100644 --- a/hw/xwin/winmsg.c +++ b/hw/xwin/winmsg.c @@ -29,6 +29,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winmsg.h" #if CYGDEBUG diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c index 96dc26f0e4..d8909f0e5d 100755 --- a/hw/xwin/winmultiwindowclass.c +++ b/hw/xwin/winmultiwindowclass.c @@ -29,6 +29,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include #include "propertyst.h" #include "windowstr.h" diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index e57755f35e..2121e998fe 100755 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -29,6 +29,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "dixevents.h" #include "winmultiwindowclass.h" diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c index e2996a81ec..7cb6a2cb92 100755 --- a/hw/xwin/winmultiwindowshape.c +++ b/hw/xwin/winmultiwindowshape.c @@ -30,6 +30,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #ifdef SHAPE #include "win.h" diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index b6df0f8639..f1ab552523 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -31,6 +31,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "dixevents.h" #include "winmultiwindowclass.h" diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index 4fbedd00a7..217603dc98 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -30,6 +30,9 @@ /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ /* X headers */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include #include #include @@ -63,7 +66,9 @@ #include "objbase.h" #include "ddraw.h" #include "winwindow.h" +#ifdef XWIN_MULTIWINDOWEXTWM #include "windowswmstr.h" +#endif extern void winDebug(const char *format, ...); @@ -1236,9 +1241,11 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg) pWMInfo->atmWmDelete = XInternAtom (pWMInfo->pDisplay, "WM_DELETE_WINDOW", False); +#ifdef WIN_MULTIWINDOWEXTWM pWMInfo->atmPrivMap = XInternAtom (pWMInfo->pDisplay, WINDOWSWM_NATIVE_HWND, False); +#endif if (1) { diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index b4f53dc2e1..59f562cb3d 100755 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -31,6 +31,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "dixevents.h" #include "winmultiwindowclass.h" diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c index dbee9d285d..c67f1c7e54 100644 --- a/hw/xwin/winnativegdi.c +++ b/hw/xwin/winnativegdi.c @@ -29,6 +29,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.14 2003/07/29 21:25:18 dawes Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c index 9a34cfb33a..d9d69039dd 100644 --- a/hw/xwin/winpfbdd.c +++ b/hw/xwin/winpfbdd.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.17 2002/10/17 08:18:22 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c index e1fa34f0c4..2780a39214 100644 --- a/hw/xwin/winpixmap.c +++ b/hw/xwin/winpixmap.c @@ -30,6 +30,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.10 2002/10/17 08:18:24 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winpntwin.c b/hw/xwin/winpntwin.c index 034ac9362f..caee712c90 100644 --- a/hw/xwin/winpntwin.c +++ b/hw/xwin/winpntwin.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" /* See Porting Layer Definition - p. 39 diff --git a/hw/xwin/winpolyline.c b/hw/xwin/winpolyline.c index c94ba06c59..db9dd345be 100644 --- a/hw/xwin/winpolyline.c +++ b/hw/xwin/winpolyline.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" /* See Porting Layer Definition - p. 50 */ diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c index 35a1a9fa5c..bbe04bd7b5 100644 --- a/hw/xwin/winprefs.c +++ b/hw/xwin/winprefs.c @@ -29,6 +29,9 @@ */ /* $XFree86: $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include #include #ifdef __CYGWIN__ @@ -36,7 +39,7 @@ #endif #include "win.h" -#include +#include #include #include "winprefs.h" diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h index 5230b16e0d..2e58e5e9da 100644 --- a/hw/xwin/winprefs.h +++ b/hw/xwin/winprefs.h @@ -39,7 +39,7 @@ /* Need to know how long paths can be... */ #include /* Xwindows redefines PATH_MAX to at least 1024 */ -#include +#include #ifndef NAME_MAX #define NAME_MAX PATH_MAX diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y index debfe0c017..2a54ff28fb 100644 --- a/hw/xwin/winprefsyacc.y +++ b/hw/xwin/winprefsyacc.y @@ -30,6 +30,9 @@ */ /* $XFree86: $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include #include #include diff --git a/hw/xwin/winpriv.c b/hw/xwin/winpriv.c index 20b0840f83..29221cf2bf 100644 --- a/hw/xwin/winpriv.c +++ b/hw/xwin/winpriv.c @@ -4,6 +4,9 @@ * Authors: Alexander Gottwald */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winpriv.h" #include "winwindow.h" diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 9bd51fa6b8..bd0b99977f 100755 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -26,6 +26,14 @@ from The Open Group. */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif +#ifdef XVENDORNAME +#define VENDOR_STRING XVENDORNAME +#define VERSION_STRING XORG_RELEASE +#define VENDOR_CONTACT BUILDERADDR +#endif #include "win.h" #include "winconfig.h" #include "winprefs.h" @@ -72,7 +80,7 @@ ENUMDISPLAYMONITORSPROC _EnumDisplayMonitors; wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data); -Bool QueryMonitor(int index, struct GetMonitorInfoData *data) +static Bool QueryMonitor(int index, struct GetMonitorInfoData *data) { /* Load EnumDisplayMonitors from DLL */ HMODULE user32; diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c index e73cecbd25..594933986d 100644 --- a/hw/xwin/winpushpxl.c +++ b/hw/xwin/winpushpxl.c @@ -45,6 +45,9 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include #include "gcstruct.h" #include "scrnintstr.h" diff --git a/hw/xwin/winrandr.c b/hw/xwin/winrandr.c index 590b3f40cf..7b5b1359c7 100755 --- a/hw/xwin/winrandr.c +++ b/hw/xwin/winrandr.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winregistry.c b/hw/xwin/winregistry.c index a39428d3e8..3571b14d76 100644 --- a/hw/xwin/winregistry.c +++ b/hw/xwin/winregistry.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" /* Prototypes */ diff --git a/hw/xwin/winrop.c b/hw/xwin/winrop.c index ca78ee72e3..1102929890 100644 --- a/hw/xwin/winrop.c +++ b/hw/xwin/winrop.c @@ -32,6 +32,9 @@ /* * Raster operations used by Windows translated to X's 16 rop codes... */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" void diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index f97539b6fe..d5117513eb 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -33,6 +33,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.27 2003/07/29 21:25:18 dawes Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winmsg.h" #include "safeAlpha.h" diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c index e41d794c5d..65b90ea393 100644 --- a/hw/xwin/winsetsp.c +++ b/hw/xwin/winsetsp.c @@ -30,6 +30,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.7 2001/11/01 12:19:42 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c index fce0c2b069..607a0674a9 100644 --- a/hw/xwin/winshaddd.c +++ b/hw/xwin/winshaddd.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.22 2002/10/17 08:18:24 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index 17b78fec5d..960cd2d70d 100644 --- a/hw/xwin/winshadddnl.c +++ b/hw/xwin/winshadddnl.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index 0f56538eda..ba98192984 100644 --- a/hw/xwin/winshadgdi.c +++ b/hw/xwin/winshadgdi.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c index 538510291a..bf7305c9c2 100755 --- a/hw/xwin/wintrayicon.c +++ b/hw/xwin/wintrayicon.c @@ -30,6 +30,9 @@ */ /* $XFree86: $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include #include "winprefs.h" @@ -111,7 +114,7 @@ winHandleIconMessage (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, winPrivScreenPtr pScreenPriv) { -#ifdef XWIN_MULTIWINDOWEXTWM +#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_MULTIWINDOW) winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; #endif diff --git a/hw/xwin/winvalargs.c b/hw/xwin/winvalargs.c index 0932644bbb..038e097a53 100755 --- a/hw/xwin/winvalargs.c +++ b/hw/xwin/winvalargs.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winmsg.h" diff --git a/hw/xwin/winvideo.c b/hw/xwin/winvideo.c index 4e1b659792..529ca76d39 100755 --- a/hw/xwin/winvideo.c +++ b/hw/xwin/winvideo.c @@ -28,6 +28,9 @@ * Authors: Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include #include diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c index 0411d7c1a0..c0200ab532 100644 --- a/hw/xwin/winwakeup.c +++ b/hw/xwin/winwakeup.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.6 2002/10/17 08:18:25 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c index 1fa77b208b..832e36d440 100755 --- a/hw/xwin/winwin32rootless.c +++ b/hw/xwin/winwin32rootless.c @@ -32,6 +32,9 @@ /* * Look at hw/darwin/quartz/xpr/xprFrame.c and hw/darwin/quartz/cr/crFrame.c */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include #define _WINDOWSWM_SERVER_ diff --git a/hw/xwin/winwin32rootlesswindow.c b/hw/xwin/winwin32rootlesswindow.c index 8c34343cee..693d5cd095 100755 --- a/hw/xwin/winwin32rootlesswindow.c +++ b/hw/xwin/winwin32rootlesswindow.c @@ -30,6 +30,9 @@ * Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include "winprefs.h" diff --git a/hw/xwin/winwin32rootlesswndproc.c b/hw/xwin/winwin32rootlesswndproc.c index 4a59aef8c7..ffa84938f4 100755 --- a/hw/xwin/winwin32rootlesswndproc.c +++ b/hw/xwin/winwin32rootlesswndproc.c @@ -29,6 +29,9 @@ * Earle F. Philhower, III * Harold L Hunt II */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include #define _WINDOWSWM_SERVER_ diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c index 8d3d6e525f..be160196a5 100644 --- a/hw/xwin/winwindow.c +++ b/hw/xwin/winwindow.c @@ -30,6 +30,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.9 2003/11/10 18:22:44 tsi Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c index a63c092106..81a1610410 100755 --- a/hw/xwin/winwindowswm.c +++ b/hw/xwin/winwindowswm.c @@ -26,6 +26,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #define NEED_REPLIES diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 771de0cb69..5d9fe14c95 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -33,6 +33,9 @@ */ /* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */ +#ifdef HAVE_XWIN_CONFIG_H +#include +#endif #include "win.h" #include #include "winprefs.h"