frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include xwin-config.h if HAVE_XWIN_CONFIG is defined Cleanup X11 includes 

handling Warning fixes
This commit is contained in:
Alexander Gottwald 2005-07-04 22:10:43 +00:00
parent 5e50ae22bf
commit 508cdb5cb0
69 changed files with 258 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xwin/ChangeLog
View File

@ -1,3 +1,10 @@
2005-07-05 Alexander Gottwald <ago at freedesktop dot org>
* *.c:
Include xwin-config.h if HAVE_XWIN_CONFIG is defined
Cleanup X11 includes handling
Warning fixes
2005-06-30 Alexander Gottwald <ago at freedesktop dot org>
* winmultiwindowwndproc.c:

3
hw/xwin/InitInput.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"
#ifdef XWIN_CLIPBOARD
# include "../../Xext/xf86miscproc.h"

36
hw/xwin/InitOutput.c
View File

@ -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 <xwin-config.h>
#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 <mntent.h>
#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

4
hw/xwin/win.h
View File

@ -963,10 +963,10 @@ winSendKeyEvent (DWORD dwKey, Bool fDown);
*/
Bool
winInstallKeyboardHookLL ();
winInstallKeyboardHookLL (void);
void
winRemoveKeyboardHookLL ();
winRemoveKeyboardHookLL (void);
/*

3
hw/xwin/winallpriv.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

3
hw/xwin/winauth.c
View File

@ -1,3 +1,6 @@
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#if defined(XCSECURITY)
/*
*Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.

3
hw/xwin/winblock.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include "winmsg.h"

3
hw/xwin/winclip.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
/* Look at mfb/mfbclip.c for sample implementation */

3
hw/xwin/winclipboardinit.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "dixstruct.h"
#include "winclipboard.h"

3
hw/xwin/winclipboardtextconv.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include <stdio.h>
#include <stdlib.h>

4
hw/xwin/winclipboardthread.c
View File

@ -28,6 +28,10 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include <sys/types.h>
#include "winclipboard.h"
#ifdef __CYGWIN__
#include <errno.h>

3
hw/xwin/winclipboardunicode.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "winclipboard.h"

5
hw/xwin/winclipboardwndproc.c
View File

@ -28,6 +28,11 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include <sys/types.h>
#include <sys/time.h>
#include "winclipboard.h"

3
hw/xwin/winclipboardwrappers.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include "dixstruct.h"
#include <X11/Xatom.h>

3
hw/xwin/winclipboardxevents.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "winclipboard.h"

3
hw/xwin/wincmap.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

5
hw/xwin/winconfig.c
View File

@ -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 <xwin-config.h>
#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 <X11/extensions/XKBsrv.h>
#endif

3
hw/xwin/wincreatewnd.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include "shellapi.h"

3
hw/xwin/wincursor.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"
#include "winmsg.h"
#include <cursorstr.h>

3
hw/xwin/windialogs.c
View File

@ -29,6 +29,9 @@
* Earle F. Philhower III
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#ifdef __CYGWIN__
#include <sys/cygwin.h>

3
hw/xwin/winengine.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include "winmsg.h"

9
hw/xwin/winerror.c
View File

@ -28,6 +28,15 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#ifdef XVENDORNAME
#define VENDOR_STRING XVENDORNAME
#define VERSION_STRING XORG_RELEASE
#define VENDOR_CONTACT BUILDERADDR
#endif
#include "win.h"
/* References to external symbols */

3
hw/xwin/winfillsp.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

5
hw/xwin/winfont.c
View File

@ -28,8 +28,12 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#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

4
hw/xwin/wingc.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#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

3
hw/xwin/wingetsp.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"
/* See Porting Layer Definition - p. 55 */

3
hw/xwin/winglobals.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"

5
hw/xwin/winkeybd.c
View File

@ -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 <xwin-config.h>
#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 <X11/extensions/XKBsrv.h>
#endif

3
hw/xwin/winkeyhook.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"

2
hw/xwin/winkeynames.h
View File

@ -27,7 +27,7 @@
#define XK_TECHNICAL
#define XK_KATAKANA
#include "keysym.h"
#include <X11/keysym.h>
#define GLYPHS_PER_KEY 4
#define NUM_KEYCODES 248

3
hw/xwin/winmisc.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#ifdef XWIN_NATIVEGDI

3
hw/xwin/winmouse.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"
#if defined(XFree86Server) && defined(XINPUT)

2
hw/xwin/winms.h
View File

@ -36,7 +36,7 @@
#define WIN32_LEAN_AND_MEAN
#endif
#include <Xwindows.h>
#include <X11/Xwindows.h>
#include <windowsx.h>
#include "ddraw.h"

3
hw/xwin/winmsg.c
View File

@ -29,6 +29,9 @@
*/
/* $XFree86$ */
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include "winmsg.h"
#if CYGDEBUG

3
hw/xwin/winmultiwindowclass.c
View File

@ -29,6 +29,9 @@
*/
/* $XFree86$ */
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include <X11/Xatom.h>
#include "propertyst.h"
#include "windowstr.h"

3
hw/xwin/winmultiwindowicons.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"
#include "dixevents.h"
#include "winmultiwindowclass.h"

3
hw/xwin/winmultiwindowshape.c
View File

@ -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 <xwin-config.h>
#endif
#ifdef SHAPE
#include "win.h"

3
hw/xwin/winmultiwindowwindow.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"
#include "dixevents.h"
#include "winmultiwindowclass.h"

7
hw/xwin/winmultiwindowwm.c
View File

@ -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 <xwin-config.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -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) {

3
hw/xwin/winmultiwindowwndproc.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"
#include "dixevents.h"
#include "winmultiwindowclass.h"

3
hw/xwin/winnativegdi.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

3
hw/xwin/winpfbdd.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

3
hw/xwin/winpixmap.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

3
hw/xwin/winpntwin.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
/* See Porting Layer Definition - p. 39

3
hw/xwin/winpolyline.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
/* See Porting Layer Definition - p. 50 */

5
hw/xwin/winprefs.c
View File

@ -29,6 +29,9 @@
*/
/* $XFree86: $ */
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#ifdef __CYGWIN__
@ -36,7 +39,7 @@
#endif
#include "win.h"
#include <Xwindows.h>
#include <X11/Xwindows.h>
#include <shellapi.h>
#include "winprefs.h"

2
hw/xwin/winprefs.h
View File

@ -39,7 +39,7 @@
/* Need to know how long paths can be... */
#include <limits.h>
/* Xwindows redefines PATH_MAX to at least 1024 */
#include <Xwindows.h>
#include <X11/Xwindows.h>
#ifndef NAME_MAX
#define NAME_MAX PATH_MAX

3
hw/xwin/winprefsyacc.y
View File

@ -30,6 +30,9 @@
*/
/* $XFree86: $ */
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

3
hw/xwin/winpriv.c
View File

@ -4,6 +4,9 @@
* Authors: Alexander Gottwald
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include "winpriv.h"
#include "winwindow.h"

10
hw/xwin/winprocarg.c
View File

@ -26,6 +26,14 @@ from The Open Group.
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#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;

3
hw/xwin/winpushpxl.c
View File

@ -45,6 +45,9 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include <X11/X.h>
#include "gcstruct.h"
#include "scrnintstr.h"

3
hw/xwin/winrandr.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"

3
hw/xwin/winregistry.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
/* Prototypes */

3
hw/xwin/winrop.c
View File

@ -32,6 +32,9 @@
/*
* Raster operations used by Windows translated to X's 16 rop codes...
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
void

3
hw/xwin/winscrinit.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"
#include "winmsg.h"
#include "safeAlpha.h"

3
hw/xwin/winsetsp.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

3
hw/xwin/winshaddd.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

3
hw/xwin/winshadddnl.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

3
hw/xwin/winshadgdi.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"

5
hw/xwin/wintrayicon.c
View File

@ -30,6 +30,9 @@
*/
/* $XFree86: $ */
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include <shellapi.h>
#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

3
hw/xwin/winvalargs.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include "winmsg.h"

3
hw/xwin/winvideo.c
View File

@ -28,6 +28,9 @@
* Authors: Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvproto.h>

3
hw/xwin/winwakeup.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

3
hw/xwin/winwin32rootless.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"
#include <winuser.h>
#define _WINDOWSWM_SERVER_

3
hw/xwin/winwin32rootlesswindow.c
View File

@ -30,6 +30,9 @@
* Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include "winprefs.h"

3
hw/xwin/winwin32rootlesswndproc.c
View File

@ -29,6 +29,9 @@
* Earle F. Philhower, III
* Harold L Hunt II
*/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#include <winuser.h>
#define _WINDOWSWM_SERVER_

3
hw/xwin/winwindow.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"

3
hw/xwin/winwindowswm.c
View File

@ -26,6 +26,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "win.h"
#define NEED_REPLIES

3
hw/xwin/winwndproc.c
View File

@ -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 <xwin-config.h>
#endif
#include "win.h"
#include <commctrl.h>
#include "winprefs.h"