summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac7
-rw-r--r--hw/xwin/InitOutput.c2
-rw-r--r--hw/xwin/glx/glshim.c3
-rw-r--r--hw/xwin/winSetAppUserModelID.c2
-rw-r--r--hw/xwin/winclipboard/xevents.c3
-rw-r--r--hw/xwin/windialogs.c4
-rw-r--r--hw/xwin/winmsgwindow.c5
-rw-r--r--hw/xwin/winmultiwindowicons.c4
-rw-r--r--hw/xwin/winmultiwindowshape.c2
-rw-r--r--hw/xwin/winmultiwindowwindow.c14
-rw-r--r--hw/xwin/winprefs.c2
-rw-r--r--hw/xwin/winprefslex.l2
-rw-r--r--hw/xwin/winprefsyacc.y11
-rw-r--r--hw/xwin/winshadddnl.c2
-rw-r--r--hw/xwin/winwndproc.c2
15 files changed, 34 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac
index ac68f17b6..fee048e36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -698,6 +698,7 @@ case $host_os in
CONFIG_UDEV=no
CONFIG_UDEV_KMS=no
DGA=no
+ DRM=no
DRI2=no
DRI3=no
INT10MODULE=no
@@ -1993,11 +1994,13 @@ if test "x$XORG" = xyes; then
gnu*)
XORG_OS_SUBDIR="hurd"
;;
+ cygwin*)
+ XORG_OS_SUBDIR="stub"
+ ;;
*)
XORG_OS_SUBDIR="stub"
AC_MSG_NOTICE([m4_text_wrap(m4_join([ ],
- [Your OS is unknown. Xorg currently only supports Linux,],
- [Free/Open/Net/DragonFlyBSD, Solaris/OpenSolaris, & GNU Hurd.],
+ [Your OS is unknown.],
[If you are interested in porting Xorg to your platform,],
[please email xorg@lists.freedesktop.org.]))])
;;
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index e86711962..eb19dceca 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -1004,7 +1004,7 @@ winCheckDisplayNumber(void)
int nDisp;
HANDLE mutex;
char name[MAX_PATH];
- char *pszPrefix = '\0';
+ const char *pszPrefix = '\0';
OSVERSIONINFO osvi = { 0 };
/* Check display range */
diff --git a/hw/xwin/glx/glshim.c b/hw/xwin/glx/glshim.c
index 7109196c0..df5a932ff 100644
--- a/hw/xwin/glx/glshim.c
+++ b/hw/xwin/glx/glshim.c
@@ -36,6 +36,7 @@
#endif
#define GL_GLEXT_LEGACY
+#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#undef GL_ARB_imaging
#undef GL_VERSION_1_3
@@ -46,6 +47,8 @@
#include "glwindows.h"
#include <glx/glxserver.h>
+extern void *glXGetProcAddressARB(const char *);
+
static HMODULE hMod = NULL;
/*
diff --git a/hw/xwin/winSetAppUserModelID.c b/hw/xwin/winSetAppUserModelID.c
index 41615e19c..f9cb92cdd 100644
--- a/hw/xwin/winSetAppUserModelID.c
+++ b/hw/xwin/winSetAppUserModelID.c
@@ -90,7 +90,7 @@ winSetAppUserModelID(HWND hWnd, const char *AppID)
return;
}
- winDebug("winSetAppUserMOdelID - hwnd 0x%08x appid '%s'\n", hWnd, AppID);
+ winDebug("winSetAppUserMOdelID - hwnd 0x%p appid '%s'\n", hWnd, AppID);
hr = g_pSHGetPropertyStoreForWindow(hWnd, &IID_IPropertyStore,
(void **) &pps);
diff --git a/hw/xwin/winclipboard/xevents.c b/hw/xwin/winclipboard/xevents.c
index d0077b846..33d52aafd 100644
--- a/hw/xwin/winclipboard/xevents.c
+++ b/hw/xwin/winclipboard/xevents.c
@@ -126,7 +126,8 @@ void
winClipboardInitMonitoredSelections(void)
{
/* Initialize static variables */
- for (int i = 0; i < CLIP_NUM_SELECTIONS; ++i)
+ int i;
+ for (i = 0; i < CLIP_NUM_SELECTIONS; ++i)
s_iOwners[i] = None;
lastOwnedSelectionIndex = CLIP_OWN_NONE;
diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c
index 61f7fe0bd..07fd40909 100644
--- a/hw/xwin/windialogs.c
+++ b/hw/xwin/windialogs.c
@@ -437,8 +437,8 @@ winChangeDepthDlgProc(HWND hwndDialog, UINT message,
s_pScreenInfo = s_pScreenPriv->pScreenInfo;
#if CYGDEBUG
- winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, "
- "s_pScreenInfo: %08x\n",
+ winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %p, "
+ "s_pScreenInfo: %p\n",
s_pScreenPriv, s_pScreenInfo);
#endif
diff --git a/hw/xwin/winmsgwindow.c b/hw/xwin/winmsgwindow.c
index 59f1da503..f5649b722 100644
--- a/hw/xwin/winmsgwindow.c
+++ b/hw/xwin/winmsgwindow.c
@@ -96,7 +96,6 @@ static HWND
winCreateMsgWindow(void)
{
HWND hwndMsg;
- wATOM winClass;
// register window class
{
@@ -114,7 +113,7 @@ winCreateMsgWindow(void)
wcx.lpszMenuName = NULL;
wcx.lpszClassName = WINDOW_CLASS_X_MSG;
wcx.hIconSm = NULL;
- winClass = RegisterClassEx(&wcx);
+ RegisterClassEx(&wcx);
}
// Create the msg window.
@@ -136,7 +135,7 @@ winCreateMsgWindow(void)
return NULL;
}
- winDebug("winCreateMsgWindow - Created msg window hwnd 0x%x\n", hwndMsg);
+ winDebug("winCreateMsgWindow - Created msg window hwnd 0x%p\n", hwndMsg);
return hwndMsg;
}
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c
index 93d389d46..c22e68874 100644
--- a/hw/xwin/winmultiwindowicons.c
+++ b/hw/xwin/winmultiwindowicons.c
@@ -382,7 +382,7 @@ winXIconToHICON(Display * pDisplay, Window id, int iconSize)
static int generation;
uint32_t *icon, *icon_data = NULL;
unsigned long int size;
- unsigned long int type;
+ Atom type;
int format;
unsigned long int left;
@@ -465,7 +465,7 @@ winXIconToHICON(Display * pDisplay, Window id, int iconSize)
xImageIcon =
XGetImage(pDisplay, hints->icon_pixmap, 0, 0, width, height,
0xFFFFFFFF, ZPixmap);
- winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%x\n", id,
+ winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%p\n", id,
xImageIcon);
if (hints->icon_mask)
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index cb0f38950..73afaea55 100644
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -47,7 +47,7 @@ winSetShapeMultiWindow(WindowPtr pWin, int kind)
winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG
- ErrorF("winSetShapeMultiWindow - pWin: %08x kind: %i\n", pWin, kind);
+ ErrorF("winSetShapeMultiWindow - pWin: %p kind: %i\n", pWin, kind);
#endif
WIN_UNWRAP(SetShape);
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index f2e7907b8..421223a7c 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -286,7 +286,7 @@ winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask)
winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG
- ErrorF("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin);
+ ErrorF("winChangeWindowAttributesMultiWindow - pWin: %p\n", pWin);
#endif
WIN_UNWRAP(ChangeWindowAttributes);
@@ -315,7 +315,7 @@ winUnmapWindowMultiWindow(WindowPtr pWin)
winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG
- ErrorF("winUnmapWindowMultiWindow - pWin: %08x\n", pWin);
+ ErrorF("winUnmapWindowMultiWindow - pWin: %p\n", pWin);
#endif
WIN_UNWRAP(UnrealizeWindow);
@@ -346,7 +346,7 @@ winMapWindowMultiWindow(WindowPtr pWin)
winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG
- ErrorF("winMapWindowMultiWindow - pWin: %08x\n", pWin);
+ ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin);
#endif
WIN_UNWRAP(RealizeWindow);
@@ -378,7 +378,7 @@ winReparentWindowMultiWindow(WindowPtr pWin, WindowPtr pPriorParent)
winScreenPriv(pScreen);
winDebug
- ("winReparentMultiWindow - pWin:%08x XID:0x%x, reparent from pWin:%08x XID:0x%x to pWin:%08x XID:0x%x\n",
+ ("winReparentMultiWindow - pWin:%p XID:0x%x, reparent from pWin:%p XID:0x%x to pWin:%p XID:0x%x\n",
pWin, pWin->drawable.id, pPriorParent, pPriorParent->drawable.id,
pWin->parent, pWin->parent->drawable.id);
@@ -409,7 +409,7 @@ winRestackWindowMultiWindow(WindowPtr pWin, WindowPtr pOldNextSib)
winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
- winTrace("winRestackMultiWindow - %08x\n", pWin);
+ winTrace("winRestackMultiWindow - %p\n", pWin);
#endif
WIN_UNWRAP(RestackWindow);
@@ -492,7 +492,7 @@ winCreateWindowsWindow(WindowPtr pWin)
winInitMultiWindowClass();
- winDebug("winCreateWindowsTopLevelWindow - pWin:%08x XID:0x%x \n", pWin,
+ winDebug("winCreateWindowsTopLevelWindow - pWin:%p XID:0x%x \n", pWin,
pWin->drawable.id);
iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN);
@@ -618,7 +618,7 @@ winDestroyWindowsWindow(WindowPtr pWin)
HICON hIcon;
HICON hIconSm;
- winDebug("winDestroyWindowsWindow - pWin:%08x XID:0x%x \n", pWin,
+ winDebug("winDestroyWindowsWindow - pWin:%p XID:0x%x \n", pWin,
pWin->drawable.id);
/* Bail out if the Windows window handle is invalid */
diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index 53abc163f..505292714 100644
--- a/hw/xwin/winprefs.c
+++ b/hw/xwin/winprefs.c
@@ -625,7 +625,7 @@ winIconIsOverride(HICON hicon)
* If @path is NULL, use the built-in default.
*/
static int
-winPrefsLoadPreferences(char *path)
+winPrefsLoadPreferences(const char *path)
{
FILE *prefFile = NULL;
diff --git a/hw/xwin/winprefslex.l b/hw/xwin/winprefslex.l
index fd13edc05..9e6f0d6d4 100644
--- a/hw/xwin/winprefslex.l
+++ b/hw/xwin/winprefslex.l
@@ -37,8 +37,6 @@
#include <string.h>
#include "winprefsyacc.h"
-extern int yyparse(void);
-
extern void ErrorF (const char* /*f*/, ...);
/* Copy the parsed string, must be free()d in yacc parser */
diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y
index 683fc44ca..9bb28ae92 100644
--- a/hw/xwin/winprefsyacc.y
+++ b/hw/xwin/winprefsyacc.y
@@ -64,7 +64,7 @@ static void SetDefaultSysMenu (char *menu, int pos);
static void SetTrayIcon (char *fname);
static void OpenMenu(char *menuname);
-static void AddMenuLine(char *name, MENUCOMMANDTYPE cmd, char *param);
+static void AddMenuLine(const char *name, MENUCOMMANDTYPE cmd, const char *param);
static void CloseMenu(void);
static void OpenIcons(void);
@@ -79,9 +79,10 @@ static void OpenSysMenu(void);
static void AddSysMenuLine(char *matchstr, char *menuname, int pos);
static void CloseSysMenu(void);
-static int yyerror (char *s);
+static int yyerror (const char *s);
extern char *yytext;
+extern int yylineno;
extern int yylex(void);
%}
@@ -252,10 +253,8 @@ debug: DEBUGOUTPUT STRING NEWLINE { ErrorF("LoadPreferences: %s\n", $2); free($
* Errors in parsing abort and print log messages
*/
static int
-yyerror (char *s)
+yyerror (const char *s)
{
- extern int yylineno; /* Handled by flex internally */
-
ErrorF("LoadPreferences: %s line %d\n", s, yylineno);
return 1;
}
@@ -308,7 +307,7 @@ OpenMenu (char *menuname)
}
static void
-AddMenuLine (char *text, MENUCOMMANDTYPE cmd, char *param)
+AddMenuLine (const char *text, MENUCOMMANDTYPE cmd, const char *param)
{
if (menu.menuItem==NULL)
menu.menuItem = malloc(sizeof(MENUITEM));
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c
index cb326dc81..896fd53d2 100644
--- a/hw/xwin/winshadddnl.c
+++ b/hw/xwin/winshadddnl.c
@@ -988,7 +988,7 @@ winRedrawScreenShadowDDNL(ScreenPtr pScreen)
/* Return immediately if we didn't get needed surfaces */
if (!pScreenPriv->pddsPrimary4 || !pScreenPriv->pddsShadow4)
- return;
+ return FALSE;
/* Get the origin of the window in the screen coords */
ptOrigin.x = pScreenInfo->dwXOffset;
diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c
index 1b0992186..76e487c0c 100644
--- a/hw/xwin/winwndproc.c
+++ b/hw/xwin/winwndproc.c
@@ -621,7 +621,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
int iBorderHeight, iBorderWidth;
#if CYGDEBUG
- winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n",
+ winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %p\n",
s_pScreenInfo);
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 01:10:13 +0000