From 97c3298caab7c5a5396fcbde02d862e5380d7d2e Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Wed, 1 Oct 2014 12:02:04 +0100 Subject: [PATCH 01/13] hw/xwin: Fix compilation with -Werror=return-type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit winshadddnl.c: In function ‘winRedrawScreenShadowDDNL’: winshadddnl.c:991:9: error: ‘return’ with no value, in function returning non-void [-Werror=return-type] Just wrong in 1c34e774 Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winshadddnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 329e8125aa3b4c83121f8290a5436c2cb4c1cf96 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Wed, 1 Oct 2014 12:14:43 +0100 Subject: [PATCH 02/13] hw/xwin: Fix compilation with -Werror=declaration-after-statement xevents.c: In function 'winClipboardInitMonitoredSelections': xevents.c:129:5: error: 'for' loop initial declarations are only allowed in C99 mode for (int i = 0; i < CLIP_NUM_SELECTIONS; ++i) Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winclipboard/xevents.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; From 03d462ddd2cacce92dc9e6bad00710d899509387 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 2 Oct 2014 12:04:20 +0100 Subject: [PATCH 03/13] hw/xwin: Fix warnings in glx/glshim.c glext.h currently requires GL_GLEXT_PROTOTYPES in order to prototype glCompressedTexImmage* functions generated_gl_shim.c:2859:6: warning: no previous prototype for 'glCompressedTexImage3DARB' [-Wmissing-prototypes] generated_gl_shim.c:2866:6: warning: no previous prototype for 'glCompressedTexImage2DARB' [-Wmissing-prototypes] generated_gl_shim.c:2873:6: warning: no previous prototype for 'glCompressedTexImage1DARB' [-Wmissing-prototypes] generated_gl_shim.c:2880:6: warning: no previous prototype for 'glCompressedTexSubImage3DARB' [-Wmissing-prototypes] generated_gl_shim.c:2887:6: warning: no previous prototype for 'glCompressedTexSubImage2DARB' [-Wmissing-prototypes] generated_gl_shim.c:2894:6: warning: no previous prototype for 'glCompressedTexSubImage1DARB' [-Wmissing-prototypes] generated_gl_shim.c:2901:6: warning: no previous prototype for 'glGetCompressedTexImageARB' [-Wmissing-prototypes] Also, explicitly prototype glXGetProcAddressARB(), as glx/glxdri*.c does, as it's not practical to include glx.h here... Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/glx/glshim.c | 3 +++ 1 file changed, 3 insertions(+) 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 #undef GL_ARB_imaging #undef GL_VERSION_1_3 @@ -46,6 +47,8 @@ #include "glwindows.h" #include +extern void *glXGetProcAddressARB(const char *); + static HMODULE hMod = NULL; /* From a14f1d94d5bb87055f7e4812e9ef75771ea65bc5 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 2 Oct 2014 14:09:40 +0100 Subject: [PATCH 04/13] hw/xwin: Fix format warnings with debug printing of pointers on 64-bit Fix various pieces of debug output, mainly under --enable-debug, which use a "%08x" printf format for a pointer type. Use "%p" format for 64-bit portability. Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winSetAppUserModelID.c | 2 +- hw/xwin/windialogs.c | 4 ++-- hw/xwin/winmsgwindow.c | 2 +- hw/xwin/winmultiwindowicons.c | 2 +- hw/xwin/winmultiwindowshape.c | 2 +- hw/xwin/winmultiwindowwindow.c | 14 +++++++------- hw/xwin/winpixmap.c | 6 +++--- hw/xwin/winwndproc.c | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) 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/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..0f26cea82 100644 --- a/hw/xwin/winmsgwindow.c +++ b/hw/xwin/winmsgwindow.c @@ -136,7 +136,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..81ab494a0 100644 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -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/winpixmap.c b/hw/xwin/winpixmap.c index ef158c854..ef50fa356 100644 --- a/hw/xwin/winpixmap.c +++ b/hw/xwin/winpixmap.c @@ -113,8 +113,8 @@ winCreatePixmapNativeGDI(ScreenPtr pScreen, pbmih); #if CYGDEBUG - winDebug("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " - "screen: %08x\n", + winDebug("winCreatePixmap () - Created a pixmap %p, %dx%dx%d, for " + "screen: %p\n", pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen); #endif @@ -146,7 +146,7 @@ winDestroyPixmapNativeGDI(PixmapPtr pPixmap) pPixmapPriv = winGetPixmapPriv(pPixmap); #if CYGDEBUG - winDebug("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n", + winDebug("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %p\n", pPixmapPriv->hBitmap); #endif diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index e3adb5605..6b1efdd15 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -629,7 +629,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 From 701492e5d9487545afeb5ebfcebccc0408ca7bc4 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 2 Oct 2014 14:30:56 +0100 Subject: [PATCH 05/13] hw/xwin: Fix warning in winXIconToHICON() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit winmultiwindowicons.c:403:29: warning: passing argument 8 of ‘XGetWindowProperty’ from incompatible pointer type [enabled by default] /usr/include/X11/Xlib.h:2688:12: note: expected ‘Atom *’ but argument is of type ‘long unsigned int *’ Looks like this has been wrong since I added it in 527cf131 :-( Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winmultiwindowicons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index 81ab494a0..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; From 394ad259596801860d32d531408a07b63e469427 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 2 Oct 2014 14:31:35 +0100 Subject: [PATCH 06/13] hw/xwin: Fix const warning in winCheckDisplayNumber() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit InitOutput.c:1032:19: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default] Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/InitOutput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 88bc85a44..ae02c1797 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -1010,7 +1010,7 @@ winCheckDisplayNumber(void) int nDisp; HANDLE mutex; char name[MAX_PATH]; - char *pszPrefix = '\0'; + const char *pszPrefix = '\0'; OSVERSIONINFO osvi = { 0 }; /* Check display range */ From 593c6b19349538ec3b89bc48eb3f0bb4c0cebb23 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 2 Oct 2014 15:35:54 +0100 Subject: [PATCH 07/13] hw/xwin: Fix const warnings in winprefsyacc.y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit winprefsyacc.y:174:5: warning: passing argument 1 of ‘AddMenuLine’ discards ‘const’ qualifier from pointer target type [enabled by default] winprefsyacc.y:67:13: note: expected ‘char *’ but argument is of type ‘const char *’ winprefsyacc.y:174:5: warning: passing argument 3 of ‘AddMenuLine’ discards ‘const’ qualifier from pointer target type [enabled by default] winprefsyacc.y:67:13: note: expected ‘char *’ but argument is of type ‘const char *’ winprefsyacc.y:175:5: warning: passing argument 3 of ‘AddMenuLine’ discards ‘const’ qualifier from pointer target type [enabled by default] winprefsyacc.y:67:13: note: expected ‘char *’ but argument is of type ‘const char *’ winprefsyacc.y:178:5: warning: passing argument 3 of ‘AddMenuLine’ discards ‘const’ qualifier from pointer target type [enabled by default] winprefsyacc.y:67:13: note: expected ‘char *’ but argument is of type ‘const char *’ winprefsyacc.c:1737:9: warning: passing argument 1 of ‘yyerror’ discards ‘const’ qualifier from pointer target type [enabled by default] winprefsyacc.y:82:12: note: expected ‘char *’ but argument is of type ‘const char *’ winprefsyacc.c:1854:3: warning: passing argument 1 of ‘yyerror’ discards ‘const’ qualifier from pointer target type [enabled by default] Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winprefsyacc.y | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y index 683fc44ca..92f222d4f 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,7 +79,7 @@ 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 yylex(void); @@ -252,7 +252,7 @@ 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 */ @@ -308,7 +308,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)); From f0f0c92a08f0ccf5a7ac447d117eb0341fe136d6 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Fri, 3 Oct 2014 14:00:06 +0100 Subject: [PATCH 08/13] hw/xwin: Fix const warning in winPrefsLoadPreferences() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit winprefs.c:643:14: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default] Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winprefs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 8f062f73805765f5769dfd7b738c8dd10062fba6 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Fri, 3 Oct 2014 14:12:57 +0100 Subject: [PATCH 09/13] hw/xwin: Fix warning in yyerror() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit winprefsyacc.y:257:3: warning: nested extern declaration of ‘yylineno’ [-Wnested-externs] Promote yylineno declaration to file scope Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winprefsyacc.y | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y index 92f222d4f..9bb28ae92 100644 --- a/hw/xwin/winprefsyacc.y +++ b/hw/xwin/winprefsyacc.y @@ -82,6 +82,7 @@ static void CloseSysMenu(void); static int yyerror (const char *s); extern char *yytext; +extern int yylineno; extern int yylex(void); %} @@ -254,8 +255,6 @@ debug: DEBUGOUTPUT STRING NEWLINE { ErrorF("LoadPreferences: %s\n", $2); free($ static int yyerror (const char *s) { - extern int yylineno; /* Handled by flex internally */ - ErrorF("LoadPreferences: %s line %d\n", s, yylineno); return 1; } From 5adfb566fe05bcf5f40b4adc1457862936d6d038 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Fri, 3 Oct 2014 14:22:30 +0100 Subject: [PATCH 10/13] hw/xwin: Fix redundant declaration warning in winprefslex.l MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit winprefslex.l:40:12: warning: redundant redeclaration of ‘yyparse’ [-Wredundant-decls] winprefsyacc.h:130:5: note: previous declaration of ‘yyparse’ was here Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winprefslex.l | 2 -- 1 file changed, 2 deletions(-) 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 #include "winprefsyacc.h" -extern int yyparse(void); - extern void ErrorF (const char* /*f*/, ...); /* Copy the parsed string, must be free()d in yacc parser */ From 549b3175afc46cee6e1b61841f854a5272eaf1f7 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 2 Oct 2014 15:37:50 +0100 Subject: [PATCH 11/13] hw/xwin: Fix unused variable warning in winCreateMsgWindow() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit winmsgwindow.c:99:11: warning: variable ‘winClass’ set but not used [-Wunused-but-set-variable] Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winmsgwindow.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/xwin/winmsgwindow.c b/hw/xwin/winmsgwindow.c index 0f26cea82..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. From 883927d2e8733f4070b2a8bcc5ec8cc2d7a661b3 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Tue, 30 Sep 2014 13:55:59 +0100 Subject: [PATCH 12/13] configure.ac: Avoid "Your OS is unknown" warning when configuring for Cygwin Don't emit "Your OS is unknown" warning when configuring with --enable-xorg to build the XOrg DDX for Cygwin. The list of supported OSes is getting a bit unwieldy, so just remove it. Signed-off-by: Jon TURNEY Reviewed-by: Adam Jackson --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c6971889c..8105763e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1993,11 +1993,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.]))]) ;; From 7ea4a21feed5ac5e71cc6d8141c97d6362402c5d Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Fri, 19 Sep 2014 13:37:50 +0100 Subject: [PATCH 13/13] configure.ac: Force --disable-libdrm on Cygwin This is now needed to avoid trying to build the modesetting driver by default when building the Xorg DDX on Cygwin. http://tinderbox.x.org/builds/2014-09-18-0011/logs/xserver/#build Signed-off-by: Jon TURNEY Reviewed-by: Adam Jackson --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 8105763e6..fcf5c0385 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