xserver: Branch 'master' - 14 commits
Keith Packard
keithp at kemper.freedesktop.org
Mon Oct 27 15:41:37 PDT 2014
configure.ac | 7 +++++--
hw/xwin/InitOutput.c | 2 +-
hw/xwin/glx/glshim.c | 3 +++
hw/xwin/winSetAppUserModelID.c | 2 +-
hw/xwin/winclipboard/xevents.c | 3 ++-
hw/xwin/windialogs.c | 4 ++--
hw/xwin/winmsgwindow.c | 5 ++---
hw/xwin/winmultiwindowicons.c | 4 ++--
hw/xwin/winmultiwindowshape.c | 2 +-
hw/xwin/winmultiwindowwindow.c | 14 +++++++-------
hw/xwin/winprefs.c | 2 +-
hw/xwin/winprefslex.l | 2 --
hw/xwin/winprefsyacc.y | 11 +++++------
hw/xwin/winshadddnl.c | 2 +-
hw/xwin/winwndproc.c | 2 +-
15 files changed, 34 insertions(+), 31 deletions(-)
New commits:
commit 3a123fbdda56b24dc01a2308137144dc960e0d61
Merge: 9b29fa9 7ea4a21
Author: Keith Packard <keithp at keithp.com>
Date: Mon Oct 27 15:39:26 2014 -0700
Merge remote-tracking branch 'jturney/master'
Conflicts:
hw/xwin/winpixmap.c
Adam removed a pile of windows code, including this file.
commit 7ea4a21feed5ac5e71cc6d8141c97d6362402c5d
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Fri Sep 19 13:37:50 2014 +0100
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 <jon.turney at dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/configure.ac b/configure.ac
index 8105763..fcf5c03 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
commit 883927d2e8733f4070b2a8bcc5ec8cc2d7a661b3
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Tue Sep 30 13:55:59 2014 +0100
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 <jon.turney at dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/configure.ac b/configure.ac
index c697188..8105763 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 at lists.freedesktop.org.]))])
;;
commit 549b3175afc46cee6e1b61841f854a5272eaf1f7
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Thu Oct 2 15:37:50 2014 +0100
hw/xwin: Fix unused variable warning in winCreateMsgWindow()
winmsgwindow.c:99:11: warning: variable ‘winClass’ set but not used [-Wunused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/winmsgwindow.c b/hw/xwin/winmsgwindow.c
index 0f26cea..f5649b7 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.
commit 5adfb566fe05bcf5f40b4adc1457862936d6d038
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Fri Oct 3 14:22:30 2014 +0100
hw/xwin: Fix redundant declaration warning in winprefslex.l
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 <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/winprefslex.l b/hw/xwin/winprefslex.l
index fd13edc..9e6f0d6 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 */
commit 8f062f73805765f5769dfd7b738c8dd10062fba6
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Fri Oct 3 14:12:57 2014 +0100
hw/xwin: Fix warning in yyerror()
winprefsyacc.y:257:3: warning: nested extern declaration of ‘yylineno’ [-Wnested-externs]
Promote yylineno declaration to file scope
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y
index 92f222d..9bb28ae 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;
}
commit f0f0c92a08f0ccf5a7ac447d117eb0341fe136d6
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Fri Oct 3 14:00:06 2014 +0100
hw/xwin: Fix const warning in winPrefsLoadPreferences()
winprefs.c:643:14: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default]
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index 53abc16..5052927 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;
commit 593c6b19349538ec3b89bc48eb3f0bb4c0cebb23
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Thu Oct 2 15:35:54 2014 +0100
hw/xwin: Fix const warnings in winprefsyacc.y
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 <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y
index 683fc44..92f222d 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));
commit 394ad259596801860d32d531408a07b63e469427
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Thu Oct 2 14:31:35 2014 +0100
hw/xwin: Fix const warning in winCheckDisplayNumber()
InitOutput.c:1032:19: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default]
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 88bc85a..ae02c17 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 */
commit 701492e5d9487545afeb5ebfcebccc0408ca7bc4
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Thu Oct 2 14:30:56 2014 +0100
hw/xwin: Fix warning in winXIconToHICON()
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 <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c
index 81ab494..c22e688 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;
commit a14f1d94d5bb87055f7e4812e9ef75771ea65bc5
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Thu Oct 2 14:09:40 2014 +0100
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 <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/winSetAppUserModelID.c b/hw/xwin/winSetAppUserModelID.c
index 41615e1..f9cb92c 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 61f7fe0..07fd409 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 59f1da5..0f26cea 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 93d389d..81ab494 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 cb0f389..73afaea 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 f2e7907..421223a 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 ef158c8..ef50fa3 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 e3adb56..6b1efdd 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
commit 03d462ddd2cacce92dc9e6bad00710d899509387
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Thu Oct 2 12:04:20 2014 +0100
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 <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/glx/glshim.c b/hw/xwin/glx/glshim.c
index 7109196..df5a932 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;
/*
commit 329e8125aa3b4c83121f8290a5436c2cb4c1cf96
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Wed Oct 1 12:14:43 2014 +0100
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 <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/winclipboard/xevents.c b/hw/xwin/winclipboard/xevents.c
index d0077b8..33d52aa 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;
commit 97c3298caab7c5a5396fcbde02d862e5380d7d2e
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Wed Oct 1 12:02:04 2014 +0100
hw/xwin: Fix compilation with -Werror=return-type
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 <jon.turney at dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c
index cb326dc..896fd53 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;
More information about the xorg-commit
mailing list