1 files changed, 1 insertions, 85 deletions
diff --git a/xorg-server/hw/xwin/wingc.c b/xorg-server/hw/xwin/wingc.c
index 7ac305d06..259d2e29d 100644
--- a/xorg-server/hw/xwin/wingc.c
+++ b/xorg-server/hw/xwin/wingc.c
@@ -37,46 +37,13 @@
  * Local prototypes
  */
 
-#if 0
-static void
- winChangeGCNativeGDI(GCPtr pGC, unsigned long ulChanges);
-#endif
-
 static void
 
 winValidateGCNativeGDI(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);
 
-#if 0
-static void
- winCopyGCNativeGDI(GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst);
-#endif
-
 static void
  winDestroyGCNativeGDI(GCPtr pGC);
 
-#if 0
-static void
- winChangeClipNativeGDI(GCPtr pGC, int nType, pointer pValue, int nRects);
-
-static void
- winDestroyClipNativeGDI(GCPtr pGC);
-
-static void
- winCopyClipNativeGDI(GCPtr pGCdst, GCPtr pGCsrc);
-#endif
-
-#if 0
-/* GC Handling Routines */
-const GCFuncs winGCFuncs = {
-    winValidateGCNativeGDI,
-    winChangeGCNativeGDI,
-    winCopyGCNativeGDI,
-    winDestroyGCNativeGDI,
-    winChangeClipNativeGDI,
-    winDestroyClipNativeGDI,
-    winCopyClipNativeGDI,
-};
-#else
 const GCFuncs winGCFuncs = {
     winValidateGCNativeGDI,
     miChangeGC,
@@ -86,7 +53,6 @@ const GCFuncs winGCFuncs = {
     miDestroyClip,
     miCopyClip,
 };
-#endif
 
 /* Drawing Primitives */
 const GCOps winGCOps = {
@@ -107,13 +73,8 @@ const GCOps winGCOps = {
     miPolyText16,
     miImageText8,
     miImageText16,
-#if 0
-    winImageGlyphBltNativeGDI,
-    winPolyGlyphBltNativeGDI,
-#else
     miImageGlyphBlt,
     miPolyGlyphBlt,
-#endif
     miPushPixels,
 };
 
@@ -126,9 +87,7 @@ winCreateGCNativeGDI(GCPtr pGC)
     winPrivGCPtr pGCPriv = NULL;
     winPrivScreenPtr pScreenPriv = NULL;
 
-#if 0
-    ErrorF("winCreateGCNativeGDI - depth: %d\n", pGC->depth);
-#endif
+  winDebug ("winCreateGCNativeGDI - depth: %d\n", pGC->depth);
 
     pGC->ops = (GCOps *) & winGCOps;
     pGC->funcs = (GCFuncs *) & winGCFuncs;
@@ -153,17 +112,6 @@ winCreateGCNativeGDI(GCPtr pGC)
     return TRUE;
 }
 
-#if 0
-/* See Porting Layer Definition - p. 45 */
-static void
-winChangeGCNativeGDI(GCPtr pGC, unsigned long ulChanges)
-{
-#if 0
-    ErrorF("winChangeGCNativeGDI () - Doing nothing\n");
-#endif
-}
-#endif
-
 static void
 winValidateGCNativeGDI(GCPtr pGC,
                        unsigned long ulChanges, DrawablePtr pDrawable)
@@ -176,15 +124,6 @@ winValidateGCNativeGDI(GCPtr pGC,
     }
 }
 
-#if 0
-/* See Porting Layer Definition - p. 46 */
-static void
-winCopyGCNativeGDI(GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst)
-{
-
-}
-#endif
-
 /* See Porting Layer Definition - p. 46 */
 static void
 winDestroyGCNativeGDI(GCPtr pGC)
@@ -210,26 +149,3 @@ winDestroyGCNativeGDI(GCPtr pGC)
     /* Invalidate the GC privates pointer */
     winSetGCPriv(pGC, NULL);
 }
-
-#if 0
-/* See Porting Layer Definition - p. 46 */
-static void
-winChangeClipNativeGDI(GCPtr pGC, int nType, pointer pValue, int nRects)
-{
-
-}
-
-/* See Porting Layer Definition - p. 47 */
-static void
-winDestroyClipNativeGDI(GCPtr pGC)
-{
-
-}
-
-/* See Porting Layer Definition - p. 47 */
-static void
-winCopyClipNativeGDI(GCPtr pGCdst, GCPtr pGCsrc)
-{
-
-}
-#endif