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

Xming, Cygwin/X: Tidy up warnings, headers and unused variables (#11132) 

Tidy up various warnings, include headers and unused variables, etc.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
This commit is contained in:
Colin Harrison 2008-12-17 17:16:02 +00:00 committed by Jon TURNEY
parent 15c4a6e088
commit b0ed1567c1
7 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xwin/winclipboard.h
View File

@ -38,7 +38,7 @@
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#include <sys/select.h> #include <sys/select.h>
#else #else
#include "Xwinsock.h" #include <X11/Xwinsock.h>
#define HAS_WINSOCK #define HAS_WINSOCK
#endif #endif
#include <fcntl.h> #include <fcntl.h>
@ -53,8 +53,8 @@
* are usually bad, so someone should investigate this. * are usually bad, so someone should investigate this.
*/ */
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "X11/Xutil.h" #include <X11/Xutil.h>
#include "X11/Xlocale.h" #include <X11/Xlocale.h>
/* Fixups to prevent collisions between Windows and X headers */ /* Fixups to prevent collisions between Windows and X headers */
#define ATOM DWORD #define ATOM DWORD

1
hw/xwin/winmultiwindowshape.c
View File

@ -44,7 +44,6 @@ void
winSetShapeMultiWindow (WindowPtr pWin) winSetShapeMultiWindow (WindowPtr pWin)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG #if CYGMULTIWINDOW_DEBUG

10
hw/xwin/winmultiwindowwindow.c
View File

@ -275,7 +275,6 @@ winChangeWindowAttributesMultiWindow (WindowPtr pWin, unsigned long mask)
{ {
Bool fResult = TRUE; Bool fResult = TRUE;
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG #if CYGMULTIWINDOW_DEBUG
@ -368,7 +367,6 @@ void
winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent) winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG #if CYGMULTIWINDOW_DEBUG
@ -392,12 +390,13 @@ winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent)
void void
winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib) winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib)
{ {
#if 0
WindowPtr pPrevWin; WindowPtr pPrevWin;
UINT uFlags; UINT uFlags;
HWND hInsertAfter; HWND hInsertAfter;
HWND hWnd = NULL; HWND hWnd = NULL;
#endif
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG #if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
@ -854,7 +853,7 @@ winMinimizeWindow (Window id)
ErrorF ("winMinimizeWindow\n"); ErrorF ("winMinimizeWindow\n");
#endif #endif
pWin = LookupIDByType (id, RT_WINDOW); pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW);
if (!pWin) if (!pWin)
{ {
ErrorF("%s: NULL pWin. Leaving\n", __FUNCTION__); ErrorF("%s: NULL pWin. Leaving\n", __FUNCTION__);
@ -892,7 +891,6 @@ winCopyWindowMultiWindow (WindowPtr pWin, DDXPointRec oldpt,
RegionPtr oldRegion) RegionPtr oldRegion)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGWINDOWING_DEBUG #if CYGWINDOWING_DEBUG
@ -912,7 +910,6 @@ winMoveWindowMultiWindow (WindowPtr pWin, int x, int y,
WindowPtr pSib, VTKind kind) WindowPtr pSib, VTKind kind)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGWINDOWING_DEBUG #if CYGWINDOWING_DEBUG
@ -933,7 +930,6 @@ winResizeWindowMultiWindow (WindowPtr pWin, int x, int y, unsigned int w,
unsigned int h, WindowPtr pSib) unsigned int h, WindowPtr pSib)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGWINDOWING_DEBUG #if CYGWINDOWING_DEBUG

8
hw/xwin/winwin32rootless.c
View File

@ -38,7 +38,7 @@
#include "win.h" #include "win.h"
#include <winuser.h> #include <winuser.h>
#define _WINDOWSWM_SERVER_ #define _WINDOWSWM_SERVER_
#include "windowswmstr.h" #include <X11/extensions/windowswmstr.h>
#include "dixevents.h" #include "dixevents.h"
#include "winmultiwindowclass.h" #include "winmultiwindowclass.h"
#include "winprefs.h" #include "winprefs.h"
@ -51,9 +51,15 @@
#define MOUSE_POLLING_INTERVAL 500 #define MOUSE_POLLING_INTERVAL 500
#ifndef ULW_COLORKEY
#define ULW_COLORKEY 0x00000001 #define ULW_COLORKEY 0x00000001
#endif
#ifndef ULW_ALPHA
#define ULW_ALPHA 0x00000002 #define ULW_ALPHA 0x00000002
#endif
#ifndef ULW_OPAQUE
#define ULW_OPAQUE 0x00000004 #define ULW_OPAQUE 0x00000004
#endif
#define AC_SRC_ALPHA 0x01 #define AC_SRC_ALPHA 0x01
/* /*

2
hw/xwin/winwin32rootlesswndproc.c
View File

@ -35,7 +35,7 @@
#include "win.h" #include "win.h"
#include <winuser.h> #include <winuser.h>
#define _WINDOWSWM_SERVER_ #define _WINDOWSWM_SERVER_
#include "windowswmstr.h" #include <X11/extensions/windowswmstr.h>
#include "dixevents.h" #include "dixevents.h"
#include "propertyst.h" #include "propertyst.h"
#include <X11/Xatom.h> #include <X11/Xatom.h>

4
hw/xwin/winwindow.c
View File

@ -350,7 +350,6 @@ winPositionWindowRootless (WindowPtr pWin, int x, int y)
{ {
Bool fResult = FALSE; Bool fResult = FALSE;
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
@ -376,7 +375,6 @@ winChangeWindowAttributesRootless (WindowPtr pWin, unsigned long mask)
{ {
Bool fResult = FALSE; Bool fResult = FALSE;
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGDEBUG #if CYGDEBUG
@ -434,7 +432,6 @@ winMapWindowRootless (WindowPtr pWin)
{ {
Bool fResult = FALSE; Bool fResult = FALSE;
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGDEBUG #if CYGDEBUG
@ -457,7 +454,6 @@ void
winSetShapeRootless (WindowPtr pWin) winSetShapeRootless (WindowPtr pWin)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin);
winScreenPriv(pScreen); winScreenPriv(pScreen);
#if CYGDEBUG #if CYGDEBUG

2
hw/xwin/winwindowswm.c
View File

@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "servermd.h" #include "servermd.h"
#include "swaprep.h" #include "swaprep.h"
#define _WINDOWSWM_SERVER_ #define _WINDOWSWM_SERVER_
#include "windowswmstr.h" #include <X11/extensions/windowswmstr.h>
static int WMErrorBase; static int WMErrorBase;