1 files changed, 10 insertions, 28 deletions

diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c
index 934f6d845..0ec17bba3 100644..100755
--- a/xorg-server/hw/xwin/winwindow.c
+++ b/xorg-server/hw/xwin/winwindow.c
@@ -61,9 +61,7 @@ winCreateWindowRootless(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winCreateWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winCreateWindowRootless (%p)\n", pWin);
 
     WIN_UNWRAP(CreateWindow);
     fResult = (*pScreen->CreateWindow) (pWin);
@@ -86,9 +84,7 @@ winDestroyWindowRootless(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winDestroyWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winDestroyWindowRootless (%p)\n", pWin);
 
     WIN_UNWRAP(DestroyWindow);
     fResult = (*pScreen->DestroyWindow) (pWin);
@@ -115,9 +111,7 @@ winPositionWindowRootless(WindowPtr pWin, int x, int y)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winPositionWindowRootless (%p)\n", pWin);
-#endif
+    winDebug ("winPositionWindowRootless (%p)\n", pWin);
 
     WIN_UNWRAP(PositionWindow);
     fResult = (*pScreen->PositionWindow) (pWin, x, y);
@@ -139,9 +133,7 @@ winChangeWindowAttributesRootless(WindowPtr pWin, unsigned long mask)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winChangeWindowAttributesRootless (%p)\n", pWin);
-#endif
+  winDebug ("winChangeWindowAttributesRootless (%p)\n", pWin);
 
     WIN_UNWRAP(ChangeWindowAttributes);
     fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
@@ -165,9 +157,7 @@ winUnmapWindowRootless(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winUnmapWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winUnmapWindowRootless (%p)\n", pWin);
 
     WIN_UNWRAP(UnrealizeWindow);
     fResult = (*pScreen->UnrealizeWindow) (pWin);
@@ -195,9 +185,7 @@ winMapWindowRootless(WindowPtr pWin)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winMapWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winMapWindowRootless (%p)\n", pWin);
 
     WIN_UNWRAP(RealizeWindow);
     fResult = (*pScreen->RealizeWindow) (pWin);
@@ -217,9 +205,7 @@ winSetShapeRootless(WindowPtr pWin, int kind)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winSetShapeRootless (%p, %i)\n", pWin, kind);
-#endif
+  winDebug ("winSetShapeRootless (%p, %i)\n", pWin, kind);
 
     WIN_UNWRAP(SetShape);
     (*pScreen->SetShape) (pWin, kind);
@@ -247,9 +233,7 @@ winAddRgn(WindowPtr pWin, void *data)
 
     /* If pWin is not Root */
     if (pWin->parent != NULL) {
-#if CYGDEBUG
         winDebug("winAddRgn ()\n");
-#endif
         if (pWin->mapped) {
             iBorder = wBorderWidth(pWin);
 
@@ -262,9 +246,9 @@ winAddRgn(WindowPtr pWin, void *data)
             hRgnWin = CreateRectRgn(0, 0, iWidth, iHeight);
 
             if (hRgnWin == NULL) {
-                ErrorF("winAddRgn - CreateRectRgn () failed\n");
-                ErrorF("  Rect %d %d %d %d\n",
-                       iX, iY, iX + iWidth, iY + iHeight);
+                 winDebug ("winAddRgn - CreateRectRgn () failed\n");
+                 winDebug ("  Rect %d %d %d %d\n",
+                           iX, iY, iX + iWidth, iY + iHeight);
             }
 
             if (pWinPriv->hRgn) {
@@ -320,9 +304,7 @@ winReshapeRootless(WindowPtr pWin)
 
     winWindowPriv(pWin);
 
-#if CYGDEBUG
     winDebug("winReshapeRootless ()\n");
-#endif
 
     /* Bail if the window is the root window */
     if (pWin->parent == NULL)