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:
parent
15c4a6e088
commit
b0ed1567c1
|
@ -38,7 +38,7 @@
|
|||
#ifdef __CYGWIN__
|
||||
#include <sys/select.h>
|
||||
#else
|
||||
#include "Xwinsock.h"
|
||||
#include <X11/Xwinsock.h>
|
||||
#define HAS_WINSOCK
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
|
@ -53,8 +53,8 @@
|
|||
* are usually bad, so someone should investigate this.
|
||||
*/
|
||||
#include <X11/Xproto.h>
|
||||
#include "X11/Xutil.h"
|
||||
#include "X11/Xlocale.h"
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xlocale.h>
|
||||
|
||||
/* Fixups to prevent collisions between Windows and X headers */
|
||||
#define ATOM DWORD
|
||||
|
|
|
@ -44,7 +44,6 @@ void
|
|||
winSetShapeMultiWindow (WindowPtr pWin)
|
||||
{
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
#if CYGMULTIWINDOW_DEBUG
|
||||
|
|
|
@ -275,7 +275,6 @@ winChangeWindowAttributesMultiWindow (WindowPtr pWin, unsigned long mask)
|
|||
{
|
||||
Bool fResult = TRUE;
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
#if CYGMULTIWINDOW_DEBUG
|
||||
|
@ -368,7 +367,6 @@ void
|
|||
winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent)
|
||||
{
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
#if CYGMULTIWINDOW_DEBUG
|
||||
|
@ -392,12 +390,13 @@ winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent)
|
|||
void
|
||||
winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib)
|
||||
{
|
||||
#if 0
|
||||
WindowPtr pPrevWin;
|
||||
UINT uFlags;
|
||||
HWND hInsertAfter;
|
||||
HWND hWnd = NULL;
|
||||
#endif
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
|
||||
|
@ -854,7 +853,7 @@ winMinimizeWindow (Window id)
|
|||
ErrorF ("winMinimizeWindow\n");
|
||||
#endif
|
||||
|
||||
pWin = LookupIDByType (id, RT_WINDOW);
|
||||
pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW);
|
||||
if (!pWin)
|
||||
{
|
||||
ErrorF("%s: NULL pWin. Leaving\n", __FUNCTION__);
|
||||
|
@ -892,7 +891,6 @@ winCopyWindowMultiWindow (WindowPtr pWin, DDXPointRec oldpt,
|
|||
RegionPtr oldRegion)
|
||||
{
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
#if CYGWINDOWING_DEBUG
|
||||
|
@ -912,7 +910,6 @@ winMoveWindowMultiWindow (WindowPtr pWin, int x, int y,
|
|||
WindowPtr pSib, VTKind kind)
|
||||
{
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
#if CYGWINDOWING_DEBUG
|
||||
|
@ -933,7 +930,6 @@ winResizeWindowMultiWindow (WindowPtr pWin, int x, int y, unsigned int w,
|
|||
unsigned int h, WindowPtr pSib)
|
||||
{
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
#if CYGWINDOWING_DEBUG
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include "win.h"
|
||||
#include <winuser.h>
|
||||
#define _WINDOWSWM_SERVER_
|
||||
#include "windowswmstr.h"
|
||||
#include <X11/extensions/windowswmstr.h>
|
||||
#include "dixevents.h"
|
||||
#include "winmultiwindowclass.h"
|
||||
#include "winprefs.h"
|
||||
|
@ -51,9 +51,15 @@
|
|||
|
||||
#define MOUSE_POLLING_INTERVAL 500
|
||||
|
||||
#ifndef ULW_COLORKEY
|
||||
#define ULW_COLORKEY 0x00000001
|
||||
#endif
|
||||
#ifndef ULW_ALPHA
|
||||
#define ULW_ALPHA 0x00000002
|
||||
#endif
|
||||
#ifndef ULW_OPAQUE
|
||||
#define ULW_OPAQUE 0x00000004
|
||||
#endif
|
||||
#define AC_SRC_ALPHA 0x01
|
||||
|
||||
/*
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "win.h"
|
||||
#include <winuser.h>
|
||||
#define _WINDOWSWM_SERVER_
|
||||
#include "windowswmstr.h"
|
||||
#include <X11/extensions/windowswmstr.h>
|
||||
#include "dixevents.h"
|
||||
#include "propertyst.h"
|
||||
#include <X11/Xatom.h>
|
||||
|
|
|
@ -350,7 +350,6 @@ winPositionWindowRootless (WindowPtr pWin, int x, int y)
|
|||
{
|
||||
Bool fResult = FALSE;
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
|
||||
|
@ -376,7 +375,6 @@ winChangeWindowAttributesRootless (WindowPtr pWin, unsigned long mask)
|
|||
{
|
||||
Bool fResult = FALSE;
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
#if CYGDEBUG
|
||||
|
@ -434,7 +432,6 @@ winMapWindowRootless (WindowPtr pWin)
|
|||
{
|
||||
Bool fResult = FALSE;
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
#if CYGDEBUG
|
||||
|
@ -457,7 +454,6 @@ void
|
|||
winSetShapeRootless (WindowPtr pWin)
|
||||
{
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
winWindowPriv(pWin);
|
||||
winScreenPriv(pScreen);
|
||||
|
||||
#if CYGDEBUG
|
||||
|
|
|
@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "servermd.h"
|
||||
#include "swaprep.h"
|
||||
#define _WINDOWSWM_SERVER_
|
||||
#include "windowswmstr.h"
|
||||
#include <X11/extensions/windowswmstr.h>
|
||||
|
||||
static int WMErrorBase;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user