diff options
| -rw-r--r-- | Xext/EVI.c | 13 | ||||
| -rw-r--r-- | Xext/bigreq.c | 13 | ||||
| -rw-r--r-- | Xext/cup.c | 20 | ||||
| -rw-r--r-- | Xext/dpms.c | 12 | ||||
| -rw-r--r-- | Xext/fontcache.c | 7 | ||||
| -rw-r--r-- | Xext/mbuf.c | 6 | ||||
| -rw-r--r-- | Xext/mitmisc.c | 13 | ||||
| -rw-r--r-- | Xext/panoramiX.c | 7 | ||||
| -rw-r--r-- | Xext/panoramiXSwap.c | 4 | ||||
| -rw-r--r-- | Xext/panoramiXprocs.c | 10 | ||||
| -rw-r--r-- | Xext/saver.c | 6 | ||||
| -rw-r--r-- | Xext/shape.c | 6 | ||||
| -rw-r--r-- | Xext/xcmisc.c | 13 | ||||
| -rw-r--r-- | Xext/xf86bigfont.c | 17 | ||||
| -rw-r--r-- | Xext/xprint.c | 19 | ||||
| -rw-r--r-- | Xext/xtest.c | 13 | ||||
| -rw-r--r-- | cfb/Makefile.am | 1 | ||||
| -rw-r--r-- | cfb/cfbcppl.c | 4 | ||||
| -rw-r--r-- | cfb/cfbmap.h | 126 | ||||
| -rw-r--r-- | cfb/cfbmskbits.h | 37 | ||||
| -rw-r--r-- | cfb/cfbtab.h | 14 | ||||
| -rw-r--r-- | dbe/dbe.c | 20 | ||||
| -rw-r--r-- | dix/window.c | 7 | ||||
| -rw-r--r-- | fb/fbblt.c | 3 | ||||
| -rw-r--r-- | include/dixevents.h | 22 | ||||
| -rw-r--r-- | include/swapreq.h | 11 | ||||
| -rw-r--r-- | mi/midispcur.c | 3 | ||||
| -rwxr-xr-x | miext/damage/damage.c | 3 | ||||
| -rw-r--r-- | os/WaitFor.c | 15 | ||||
| -rw-r--r-- | os/io.c | 5 | ||||
| -rw-r--r-- | os/osinit.c | 4 | ||||
| -rw-r--r-- | render/picturestr.h | 6 | ||||
| -rw-r--r-- | render/render.c | 118 |
33 files changed, 3 insertions, 575 deletions
diff --git a/Xext/EVI.c b/Xext/EVI.c index 8fe3481d4..4bd050ca7 100644 --- a/Xext/EVI.c +++ b/Xext/EVI.c @@ -35,9 +35,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "EVIstruct.h" #include "modinit.h" -#if 0 -static unsigned char XEVIReqCode = 0; -#endif static EviPrivPtr eviPriv; static int @@ -182,19 +179,9 @@ EVIResetProc(ExtensionEntry *extEntry) void EVIExtensionInit(INITARGS) { -#if 0 - ExtensionEntry *extEntry; - - if ((extEntry = AddExtension(EVINAME, 0, 0, - ProcEVIDispatch, - SProcEVIDispatch, - EVIResetProc, StandardMinorOpcode))) { - XEVIReqCode = (unsigned char)extEntry->base; -#else if (AddExtension(EVINAME, 0, 0, ProcEVIDispatch, SProcEVIDispatch, EVIResetProc, StandardMinorOpcode)) { -#endif eviPriv = eviDDXInit(); } } diff --git a/Xext/bigreq.c b/Xext/bigreq.c index fcd848aec..e7d410250 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -41,10 +41,6 @@ from The Open Group. #include "opaque.h" #include "modinit.h" -#if 0 -static unsigned char XBigReqCode; -#endif - static void BigReqResetProc( ExtensionEntry * /* extEntry */ ); @@ -54,18 +50,9 @@ static DISPATCH_PROC(ProcBigReqDispatch); void BigReqExtensionInit(INITARGS) { -#if 0 - ExtensionEntry *extEntry; - - if ((extEntry = AddExtension(XBigReqExtensionName, 0, 0, - ProcBigReqDispatch, ProcBigReqDispatch, - BigReqResetProc, StandardMinorOpcode)) != 0) - XBigReqCode = (unsigned char)extEntry->base; -#else (void) AddExtension(XBigReqExtensionName, 0, 0, ProcBigReqDispatch, ProcBigReqDispatch, BigReqResetProc, StandardMinorOpcode); -#endif DeclareExtensionSecurity(XBigReqExtensionName, TRUE); } diff --git a/Xext/cup.c b/Xext/cup.c index 6bfa27837..0a83855e5 100644 --- a/Xext/cup.c +++ b/Xext/cup.c @@ -51,11 +51,6 @@ static int ProcDispatch(ClientPtr client); static int SProcDispatch(ClientPtr client); static void ResetProc(ExtensionEntry* extEntry); -#if 0 -static unsigned char ReqCode = 0; -static int ErrorBase; -#endif - #if defined(WIN32) || defined(TESTWIN32) #define HAVE_SPECIAL_DESKTOP_COLORS #endif @@ -128,20 +123,6 @@ static xColorItem citems[] = { void XcupExtensionInit (INITARGS) { -#if 0 - ExtensionEntry* extEntry; - - if ((extEntry = AddExtension (XCUPNAME, - 0, - XcupNumberErrors, - ProcDispatch, - SProcDispatch, - ResetProc, - StandardMinorOpcode))) { - ReqCode = (unsigned char)extEntry->base; - ErrorBase = extEntry->errorBase; - } -#else (void) AddExtension (XCUPNAME, 0, XcupNumberErrors, @@ -149,7 +130,6 @@ XcupExtensionInit (INITARGS) SProcDispatch, ResetProc, StandardMinorOpcode); -#endif /* PC servers initialize the desktop colors (citems) here! */ } diff --git a/Xext/dpms.c b/Xext/dpms.c index aced40639..b062b53aa 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -50,9 +50,6 @@ Equipment Corporation. #include "dpmsproc.h" #include "modinit.h" -#if 0 -static unsigned char DPMSCode; -#endif static DISPATCH_PROC(ProcDPMSDispatch); static DISPATCH_PROC(SProcDPMSDispatch); static DISPATCH_PROC(ProcDPMSGetVersion); @@ -76,18 +73,9 @@ static void DPMSResetProc(ExtensionEntry* extEntry); void DPMSExtensionInit(INITARGS) { -#if 0 - ExtensionEntry *extEntry; - - if ((extEntry = AddExtension(DPMSExtensionName, 0, 0, - ProcDPMSDispatch, SProcDPMSDispatch, - DPMSResetProc, StandardMinorOpcode))) - DPMSCode = (unsigned char)extEntry->base; -#else (void) AddExtension(DPMSExtensionName, 0, 0, ProcDPMSDispatch, SProcDPMSDispatch, DPMSResetProc, StandardMinorOpcode); -#endif } /*ARGSUSED*/ diff --git a/Xext/fontcache.c b/Xext/fontcache.c index c54340b61..0338d4a0f 100644 --- a/Xext/fontcache.c +++ b/Xext/fontcache.c @@ -67,10 +67,6 @@ static DISPATCH_PROC(SProcFontCacheGetCacheStatistics); static DISPATCH_PROC(SProcFontCacheQueryVersion); static DISPATCH_PROC(SProcFontCacheChangeCacheSettings); -#if 0 -static unsigned char FontCacheReqCode = 0; -#endif - void FontCacheExtensionInit(INITARGS) { @@ -84,9 +80,6 @@ FontCacheExtensionInit(INITARGS) SProcFontCacheDispatch, FontCacheResetProc, StandardMinorOpcode))) { -#if 0 - FontCacheReqCode = (unsigned char)extEntry->base; -#endif miscErrorBase = extEntry->errorBase; } } diff --git a/Xext/mbuf.c b/Xext/mbuf.c index 729656048..e646a7daa 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -59,9 +59,6 @@ in this Software without prior written authorization from The Open Group. #define ValidEventMasks (ExposureMask|MultibufferClobberNotifyMask|MultibufferUpdateNotifyMask) -#if 0 -static unsigned char MultibufferReqCode; -#endif static int MultibufferEventBase; static int MultibufferErrorBase; int MultibufferScreenIndex = -1; @@ -247,9 +244,6 @@ MultibufferExtensionInit() ProcMultibufferDispatch, SProcMultibufferDispatch, MultibufferResetProc, StandardMinorOpcode))) { -#if 0 - MultibufferReqCode = (unsigned char)extEntry->base; -#endif MultibufferEventBase = extEntry->eventBase; MultibufferErrorBase = extEntry->errorBase; EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent; diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c index 924b88063..f89ee0c2b 100644 --- a/Xext/mitmisc.c +++ b/Xext/mitmisc.c @@ -42,10 +42,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/extensions/mitmiscstr.h> #include "modinit.h" -#if 0 -static unsigned char MITReqCode; -#endif - static void MITResetProc( ExtensionEntry * /* extEntry */ ); @@ -60,18 +56,9 @@ static DISPATCH_PROC(SProcMITSetBugMode); void MITMiscExtensionInit(INITARGS) { -#if 0 - ExtensionEntry *extEntry; - - if ((extEntry = AddExtension(MITMISCNAME, 0, 0, - ProcMITDispatch, SProcMITDispatch, - MITResetProc, StandardMinorOpcode)) != 0) - MITReqCode = (unsigned char)extEntry->base; -#else (void) AddExtension(MITMISCNAME, 0, 0, ProcMITDispatch, SProcMITDispatch, MITResetProc, StandardMinorOpcode); -#endif } /*ARGSUSED*/ diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 95df04320..d054cf8f1 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -65,9 +65,6 @@ extern VisualPtr glxMatchVisual(ScreenPtr pScreen, ScreenPtr pMatchScreen); #endif -#if 0 -static unsigned char PanoramiXReqCode = 0; -#endif /* * PanoramiX data declarations */ @@ -471,10 +468,6 @@ void PanoramiXExtensionInit(int argc, char *argv[]) break; } -#if 0 - PanoramiXReqCode = (unsigned char)extEntry->base; -#endif - /* * First make sure all the basic allocations succeed. If not, * run in non-PanoramiXeen mode. diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c index da445ffe1..cc9f61442 100644 --- a/Xext/panoramiXSwap.c +++ b/Xext/panoramiXSwap.c @@ -41,10 +41,6 @@ Equipment Corporation. #include "window.h" #include "windowstr.h" #include "pixmapstr.h" -#if 0 -#include <sys/workstation.h> -#include <X11/Xserver/ws.h> -#endif #include "panoramiX.h" #include <X11/extensions/panoramiXproto.h> #include "panoramiXsrv.h" diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index f51f65663..4bd525727 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -54,16 +54,6 @@ Equipment Corporation. #define INPUTONLY_LEGAL_MASK (CWWinGravity | CWEventMask | \ CWDontPropagate | CWOverrideRedirect | CWCursor ) -#if 0 -extern void (* EventSwapVector[128]) (fsError *, fsError *); - -extern void Swap32Write(); -extern void SLHostsExtend(); -extern void SQColorsExtend(); -WriteSConnectionInfo(); -extern void WriteSConnSetupPrefix(); -#endif - /* Various of the DIX function interfaces were not designed to allow * the client->errorValue to be set on BadValue and other errors. * Rather than changing interfaces and breaking untold code we introduce diff --git a/Xext/saver.c b/Xext/saver.c index a590583df..44689fc53 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -61,9 +61,6 @@ in this Software without prior written authorization from the X Consortium. #include "modinit.h" -#if 0 -static unsigned char ScreenSaverReqCode = 0; -#endif static int ScreenSaverEventBase = 0; static DISPATCH_PROC(ProcScreenSaverQueryInfo); @@ -272,9 +269,6 @@ ScreenSaverExtensionInit(INITARGS) ProcScreenSaverDispatch, SProcScreenSaverDispatch, ScreenSaverResetProc, StandardMinorOpcode))) { -#if 0 - ScreenSaverReqCode = (unsigned char)extEntry->base; -#endif ScreenSaverEventBase = extEntry->eventBase; EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent; } diff --git a/Xext/shape.c b/Xext/shape.c index 6515a10d7..9c765f22e 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -111,9 +111,6 @@ static DISPATCH_PROC(SProcShapeSelectInput); #include "panoramiXsrv.h" #endif -#if 0 -static unsigned char ShapeReqCode = 0; -#endif static int ShapeEventBase = 0; static RESTYPE ClientType, EventType; /* resource types for event masks */ @@ -154,9 +151,6 @@ ShapeExtensionInit(void) ProcShapeDispatch, SProcShapeDispatch, ShapeResetProc, StandardMinorOpcode))) { -#if 0 - ShapeReqCode = (unsigned char)extEntry->base; -#endif ShapeEventBase = extEntry->eventBase; EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent; } diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 8c7a86e6a..a3d40e3ce 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -48,10 +48,6 @@ from The Open Group. #define UINT32_MAX 0xffffffffU #endif -#if 0 -static unsigned char XCMiscCode; -#endif - static void XCMiscResetProc( ExtensionEntry * /* extEntry */ ); @@ -68,18 +64,9 @@ static DISPATCH_PROC(SProcXCMiscGetXIDRange); void XCMiscExtensionInit(INITARGS) { -#if 0 - ExtensionEntry *extEntry; - - if ((extEntry = AddExtension(XCMiscExtensionName, 0, 0, - ProcXCMiscDispatch, SProcXCMiscDispatch, - XCMiscResetProc, StandardMinorOpcode)) != 0) - XCMiscCode = (unsigned char)extEntry->base; -#else (void) AddExtension(XCMiscExtensionName, 0, 0, ProcXCMiscDispatch, SProcXCMiscDispatch, XCMiscResetProc, StandardMinorOpcode); -#endif DeclareExtensionSecurity(XCMiscExtensionName, TRUE); } diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index b20e82d6e..f26605eb9 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -86,10 +86,6 @@ static DISPATCH_PROC(SProcXF86BigfontDispatch); static DISPATCH_PROC(SProcXF86BigfontQueryVersion); static DISPATCH_PROC(SProcXF86BigfontQueryFont); -#if 0 -static unsigned char XF86BigfontReqCode; -#endif - #ifdef HAS_SHM /* A random signature, transmitted to the clients so they can verify that the @@ -149,18 +145,6 @@ CheckForShmSyscall(void) void XFree86BigfontExtensionInit() { -#if 0 - ExtensionEntry* extEntry; - - if ((extEntry = AddExtension(XF86BIGFONTNAME, - XF86BigfontNumberEvents, - XF86BigfontNumberErrors, - ProcXF86BigfontDispatch, - SProcXF86BigfontDispatch, - XF86BigfontResetProc, - StandardMinorOpcode))) { - XF86BigfontReqCode = (unsigned char) extEntry->base; -#else if (AddExtension(XF86BIGFONTNAME, XF86BigfontNumberEvents, XF86BigfontNumberErrors, @@ -168,7 +152,6 @@ XFree86BigfontExtensionInit() SProcXF86BigfontDispatch, XF86BigfontResetProc, StandardMinorOpcode)) { -#endif #ifdef HAS_SHM #ifdef MUST_CHECK_FOR_SHM_SYSCALL /* diff --git a/Xext/xprint.c b/Xext/xprint.c index 4ac13e6d1..42c6e6a2a 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -389,25 +389,6 @@ XpCloseScreen(int index, ScreenPtr pScreen) return (*CloseScreen)(index, pScreen); } -#if 0 /* NOT USED */ -static void -FreeScreenEntry(XpScreenPtr pScreenEntry) -{ - XpDriverPtr pDriver; - - pDriver = pScreenEntry->drivers; - while(pDriver != (XpDriverPtr)NULL) - { - XpDriverPtr tmp; - - tmp = pDriver->next; - xfree(pDriver); - pDriver = tmp; - } - xfree(pScreenEntry); -} -#endif - /* * XpRegisterInitFunc tells the print extension which screens * are printers as opposed to displays, and what drivers are diff --git a/Xext/xtest.c b/Xext/xtest.c index 94d8974b6..96ae18225 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -54,10 +54,6 @@ from The Open Group. #include "modinit.h" -#if 0 -static unsigned char XTestReqCode; -#endif - #ifdef XINPUT extern int DeviceValuator; #endif /* XINPUT */ @@ -89,18 +85,9 @@ static DISPATCH_PROC(SProcXTestGrabControl); void XTestExtensionInit(INITARGS) { -#if 0 - ExtensionEntry *extEntry; - - if ((extEntry = AddExtension(XTestExtensionName, 0, 0, - ProcXTestDispatch, SProcXTestDispatch, - XTestResetProc, StandardMinorOpcode)) != 0) - XTestReqCode = (unsigned char)extEntry->base; -#else (void) AddExtension(XTestExtensionName, 0, 0, ProcXTestDispatch, SProcXTestDispatch, XTestResetProc, StandardMinorOpcode); -#endif } /*ARGSUSED*/ diff --git a/cfb/Makefile.am b/cfb/Makefile.am index d24f027e7..901fc95ae 100644 --- a/cfb/Makefile.am +++ b/cfb/Makefile.am @@ -16,7 +16,6 @@ INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \ cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \ cfb16.h cfb24.h cfb32.h cfb8bit.h cfbrrop.h \ - cfbtab.h \ stip68kgnu.h stipmips.s stipsparc.s stipsprc32.s sdk_HEADERS = cfb.h cfb32.h cfb16.h cfbmap.h cfbunmap.h cfbmskbits.h diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index c13baf143..00714cbc4 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.c @@ -42,9 +42,7 @@ in this Software without prior written authorization from The Open Group. #include "maskbits.h" #define PSZ 8 #include "mergerop.h" -#else /* PSZ==8 */ -#include "cfbtab.h" /* provides starttab, endttab, partmasks */ -#endif /* PSZ==8 */ +#endif void diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h index 2e709b19d..d6d447555 100644 --- a/cfb/cfbmap.h +++ b/cfb/cfbmap.h @@ -30,132 +30,6 @@ in this Software without prior written authorization from The Open Group. * Map names around so that multiple depths can be supported simultaneously */ -#if 0 -#undef QuartetBitsTable -#undef QuartetPixelMaskTable -#undef cfb8ClippedLineCopy -#undef cfb8ClippedLineGeneral -#undef cfb8ClippedLineXor -#undef cfb8LineSS1Rect -#undef cfb8LineSS1RectCopy -#undef cfb8LineSS1RectGeneral -#undef cfb8LineSS1RectPreviousCopy -#undef cfb8LineSS1RectXor -#undef cfb8SegmentSS1Rect -#undef cfb8SegmentSS1RectCopy -#undef cfb8SegmentSS1RectGeneral -#undef cfb8SegmentSS1RectShiftCopy -#undef cfb8SegmentSS1RectXor -#undef cfbAllocatePrivates -#undef cfbBSFuncRec -#undef cfbBitBlt -#undef cfbBresD -#undef cfbBresS -#undef cfbChangeWindowAttributes -#undef cfbCloseScreen -#undef cfbCopyArea -#undef cfbCopyImagePlane -#undef cfbCopyPixmap -#undef cfbCopyPlane -#undef cfbCopyPlaneReduce -#undef cfbCopyRotatePixmap -#undef cfbCopyWindow -#undef cfbCreateGC -#undef cfbCreatePixmap -#undef cfbCreateScreenResources -#undef cfbCreateWindow -#undef cfbDestroyPixmap -#undef cfbDestroyWindow -#undef cfbDoBitblt -#undef cfbDoBitbltCopy -#undef cfbDoBitbltGeneral -#undef cfbDoBitbltOr -#undef cfbDoBitbltXor -#undef cfbFillBoxTile32sCopy -#undef cfbFillBoxTile32sGeneral -#undef cfbFillBoxTileOdd -#undef cfbFillBoxTileOddCopy -#undef cfbFillBoxTileOddGeneral -#undef cfbFillPoly1RectCopy -#undef cfbFillPoly1RectGeneral -#undef cfbFillRectSolidCopy -#undef cfbFillRectSolidGeneral -#undef cfbFillRectSolidXor -#undef cfbFillRectTile32Copy -#undef cfbFillRectTile32General -#undef cfbFillRectTileOdd -#undef cfbFillSpanTile32sCopy -#undef cfbFillSpanTile32sGeneral -#undef cfbFillSpanTileOddCopy -#undef cfbFillSpanTileOddGeneral -#undef cfbFinishScreenInit -#undef cfbGCFuncs -#undef cfbGCPrivateIndex -#undef cfbGetImage -#undef cfbGetScreenPixmap -#undef cfbGetSpans -#undef cfbHorzS -#undef cfbImageGlyphBlt8 -#undef cfbInitializeColormap -#undef cfbInstallColormap -#undef cfbLineSD -#undef cfbLineSS -#undef cfbListInstalledColormaps -#undef cfbMapWindow -#undef cfbMatchCommon -#undef cfbNonTEOps -#undef cfbNonTEOps1Rect -#undef cfbPadPixmap -#undef cfbPolyFillArcSolidCopy -#undef cfbPolyFillArcSolidGeneral -#undef cfbPolyFillRect -#undef cfbPolyGlyphBlt8 -#undef cfbPolyGlyphRop8 -#undef cfbPolyPoint -#undef cfbPositionWindow -#undef cfbPutImage -#undef cfbReduceRasterOp -#undef cfbResolveColor -#undef cfbRestoreAreas -#undef cfbSaveAreas -#undef cfbScreenInit -#undef cfbScreenPrivateIndex -#undef cfbSegmentSD -#undef cfbSegmentSS -#undef cfbSetScanline -#undef cfbSetScreenPixmap -#undef cfbSetSpans -#undef cfbSetupScreen -#undef cfbSolidSpansCopy -#undef cfbSolidSpansGeneral -#undef cfbSolidSpansXor -#undef cfbStippleStack -#undef cfbStippleStackTE -#undef cfbTEGlyphBlt -#undef cfbTEOps -#undef cfbTEOps1Rect -#undef cfbTile32FSCopy -#undef cfbTile32FSGeneral -#undef cfbUninstallColormap -#undef cfbUnmapWindow -#undef cfbUnnaturalStippleFS -#undef cfbUnnaturalTileFS -#undef cfbValidateGC -#undef cfbVertS -#undef cfbWindowPrivateIndex -#undef cfbXRotatePixmap -#undef cfbYRotatePixmap -#undef cfbZeroPolyArcSS8Copy -#undef cfbZeroPolyArcSS8General -#undef cfbZeroPolyArcSS8Xor -#undef cfbendpartial -#undef cfbendtab -#undef cfbmask -#undef cfbrmask -#undef cfbstartpartial -#undef cfbstarttab -#endif - /* a losing vendor cpp dumps core if we define CFBNAME in terms of CATNAME */ #if PSZ != 8 diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index 6076269b3..5ee9125dd 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -831,42 +831,6 @@ if ((x) + (w) <= PPW) {\ *(destpix) = (*(psrcpix)) & QuartetPixelMaskTable[q]; \ } #if PSZ == 24 -# if 0 -#define getstipplepixels24(psrcstip,xt,w,ones,psrcpix,destpix,stipindex,srcindex,dstindex) \ -{ \ - PixelGroup q; \ - CfbBits src; \ - register unsigned int sidx; \ - register unsigned int didx; \ - sidx = ((srcindex) & 3)<<1; \ - didx = ((dstindex) & 3)<<1; \ - q = *(psrcstip) >> (xt); \ -/* if((srcindex)!=0)*/ \ -/* src = (((*(psrcpix)) << cfb24Shift[sidx]) & (cfbmask[sidx])) |*/ \ -/* (((*((psrcpix)+1)) << cfb24Shift[sidx+1]) & (cfbmask[sidx+1])); */\ -/* else */\ - src = (*(psrcpix))&0xFFFFFF; \ - if ( ((xt)+(w)) > PGSZ ) \ - q |= (*((psrcstip)+1)) << (PGSZ -(xt)); \ - q = QuartetBitsTable[(w)] & ((ones) ? q : ~q); \ - src &= QuartetPixelMaskTable[q]; \ - *(destpix) &= cfbrmask[didx]; \ - switch(didx) {\ - case 0: \ - *(destpix) |= (src &cfbmask[didx]); \ - break; \ - case 2: \ - case 4: \ - destpix++;didx++; \ - *(destpix) = ((*(destpix)) & (cfbrmask[didx]))| \ - (BitLeft(src, cfb24Shift[didx]) & (cfbmask[didx])); \ - destpix--; didx--;\ - case 6: \ - *(destpix) |= (BitRight(src, cfb24Shift[didx]) & cfbmask[didx]); \ - break; \ - }; \ -} -# else #define getstipplepixels24(psrcstip,xt,ones,psrcpix,destpix,stipindex) \ { \ PixelGroup q; \ @@ -874,7 +838,6 @@ if ((x) + (w) <= PPW) {\ q = ((ones) ? q : ~q) & 1; \ *(destpix) = (*(psrcpix)) & QuartetPixelMaskTable[q]; \ } -# endif #endif /* PSZ == 24 */ #endif diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h deleted file mode 100644 index 60d203f90..000000000 --- a/cfb/cfbtab.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#ifndef _CFBTAB_H_ -#define _CFBTAB_H_ - -/* prototypes */ -#if 0 -extern int starttab[32], endtab[32]; -extern unsigned int partmasks[32][32]; -#endif - -#endif /* _CFBTAB_H_ */ @@ -163,26 +163,6 @@ DbeAllocWinPriv(ScreenPtr pScreen) /****************************************************************************** * - * DBE DIX Procedure: DbeFallbackAllocWinPriv - * - * Description: - * - * This is a fallback function for AllocWinPriv(). - * - *****************************************************************************/ - -#if 0 /* NOT USED */ -static DbeWindowPrivPtr -DbeFallbackAllocWinPriv(pScreen) - ScreenPtr pScreen; -{ - return (NULL); -} /* DbeFallbackAllocWinPriv() */ -#endif - - -/****************************************************************************** - * * DBE DIX Procedure: DbeAllocWinPrivPrivIndex * * Description: diff --git a/dix/window.c b/dix/window.c index f65fb848f..129ebc679 100644 --- a/dix/window.c +++ b/dix/window.c @@ -145,13 +145,6 @@ _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF; _X_EXPORT ScreenSaverStuffRec savedScreenInfo[MAXSCREENS]; -#if 0 -extern void DeleteWindowFromAnyEvents(); -extern Mask EventMaskForClient(); -extern void WindowHasNewCursor(); -extern void RecalculateDeliverableEvents(); -#endif - static Bool TileScreenSaver(int i, int kind); diff --git a/fb/fbblt.c b/fb/fbblt.c index 837c3a239..38271c0c9 100644 --- a/fb/fbblt.c +++ b/fb/fbblt.c @@ -825,9 +825,6 @@ fbBltOdd24 (FbBits *srcLine, even = TRUE; } } -#if 0 - fprintf (stderr, "\n"); -#endif } #endif diff --git a/include/dixevents.h b/include/dixevents.h index 62c867277..77b37c85e 100644 --- a/include/dixevents.h +++ b/include/dixevents.h @@ -41,28 +41,6 @@ extern int MaybeDeliverEventsToClient( extern int ProcWarpPointer(ClientPtr /* client */); -#if 0 -extern void -#ifdef XKB -CoreProcessKeyboardEvent ( -#else -ProcessKeyboardEvent ( -#endif - xEvent * /* xE */, - DeviceIntPtr /* keybd */, - int /* count */); - -extern void -#ifdef XKB -CoreProcessPointerEvent ( -#else -ProcessPointerEvent ( -#endif - xEvent * /* xE */, - DeviceIntPtr /* mouse */, - int /* count */); -#endif - extern int EventSelectForWindow( WindowPtr /* pWin */, ClientPtr /* client */, diff --git a/include/swapreq.h b/include/swapreq.h index 9c785fe62..83e524bab 100644 --- a/include/swapreq.h +++ b/include/swapreq.h @@ -26,17 +26,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SWAPREQ_H #define SWAPREQ_H 1 -/* The first two are in misc.h */ -#if 0 -extern void SwapLongs ( - CARD32 * /* list */, - unsigned long /* count */); - -extern void SwapShorts ( - short * /* list */, - unsigned long /* count */); -#endif - extern void SwapColorItem( xColorItem * /* pItem */); diff --git a/mi/midispcur.c b/mi/midispcur.c index 7b203f71f..918e401a5 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -182,9 +182,6 @@ miDCCloseScreen (index, pScreen) tossPix (pScreenPriv->pSave); tossPix (pScreenPriv->pTemp); #ifdef ARGB_CURSOR -#if 0 /* This has been free()d before */ - tossPict (pScreenPriv->pRootPicture); -#endif tossPict (pScreenPriv->pTempPicture); #endif xfree ((pointer) pScreenPriv); diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 17425aeb2..8f1e3b741 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -243,9 +243,6 @@ damageDamageRegion (DrawablePtr pDrawable, RegionPtr pRegion, Bool clip, if (pDamage->pDrawable->type == DRAWABLE_WINDOW && !((WindowPtr) (pDamage->pDrawable))->realized) { -#if 0 - DAMAGE_DEBUG (("damage while window unrealized\n")); -#endif continue; } diff --git a/os/WaitFor.c b/os/WaitFor.c index 7683477e6..71ca53438 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -410,21 +410,6 @@ WaitForSomething(int *pClientsReady) return nready; } -#if 0 -/* - * This is not always a macro. - */ -ANYSET(FdMask *src) -{ - int i; - - for (i=0; i<mskcnt; i++) - if (src[ i ]) - return (TRUE); - return (FALSE); -} -#endif - /* If time has rewound, re-run every affected timer. * Timers might drop out of the list, so we have to restart every time. */ static void @@ -57,9 +57,8 @@ SOFTWARE. #include <dix-config.h> #endif -#if 0 -#define DEBUG_COMMUNICATION -#endif +#undef DEBUG_COMMUNICATION + #ifdef WIN32 #include <X11/Xwinsock.h> #endif diff --git a/os/osinit.c b/os/osinit.c index 1f09f068e..1bc8624dc 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -194,10 +194,6 @@ OsInit(void) rlim.rlim_cur = limitNoFile; else rlim.rlim_cur = rlim.rlim_max; -#if 0 - if (rlim.rlim_cur > MAXSOCKS) - rlim.rlim_cur = MAXSOCKS; -#endif (void)setrlimit(RLIMIT_NOFILE, &rlim); } } diff --git a/render/picturestr.h b/render/picturestr.h index b2e180f11..ba165a411 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -504,12 +504,6 @@ SetPictureToDefaults (PicturePtr pPicture); PicturePtr AllocatePicture (ScreenPtr pScreen); -#if 0 -Bool -miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats); -#endif - - PicturePtr CreatePicture (Picture pid, DrawablePtr pDrawable, diff --git a/render/render.c b/render/render.c index ca6e62f50..b432406f7 100644 --- a/render/render.c +++ b/render/render.c @@ -212,9 +212,6 @@ int (*SProcRenderVector[RenderNumberRequests])(ClientPtr) = { static void RenderResetProc (ExtensionEntry *extEntry); -#if 0 -static CARD8 RenderReqCode; -#endif int RenderErrBase; int RenderClientPrivateIndex; @@ -259,9 +256,6 @@ RenderExtensionInit (void) RenderResetProc, StandardMinorOpcode); if (!extEntry) return; -#if 0 - RenderReqCode = (CARD8) extEntry->base; -#endif RenderErrBase = extEntry->errorBase; } @@ -299,26 +293,6 @@ ProcRenderQueryVersion (ClientPtr client) return (client->noClientException); } -#if 0 -static int -VisualDepth (ScreenPtr pScreen, VisualPtr pVisual) -{ - DepthPtr pDepth; - int d, v; - - for (d = 0; d < pScreen->numDepths; d++) - { - pDepth = pScreen->allowedDepths + d; - for (v = 0; v < pDepth->numVids; v++) - { - if (pDepth->vids[v] == pVisual->vid) - return pDepth->depth; - } - } - return 0; -} -#endif - static VisualPtr findVisual (ScreenPtr pScreen, VisualID vid) { @@ -3225,98 +3199,6 @@ PanoramiXRenderTriFan(ClientPtr client) return result; } -#if 0 /* Not implemented yet */ - -static int -PanoramiXRenderColorTrapezoids(ClientPtr client) -{ - PanoramiXRes *src, *dst; - int result = Success, j; - REQUEST(xRenderColorTrapezoidsReq); - char *extra; - int extra_len; - - REQUEST_AT_LEAST_SIZE (xRenderColorTrapezoidsReq); - - VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, - RenderErrBase + BadPicture); - - extra_len = (client->req_len << 2) - sizeof (xRenderColorTrapezoidsReq); - - if (extra_len && - (extra = (char *) xalloc (extra_len))) { - memcpy (extra, stuff + 1, extra_len); - - FOR_NSCREENS_FORWARD(j) { - if (j) memcpy (stuff + 1, extra, extra_len); - if (dst->u.pict.root) { - int x_off = panoramiXdataPtr[j].x; - int y_off = panoramiXdataPtr[j].y; - - if(x_off || y_off) { - ....; - } - } - - stuff->dst = dst->info[j].id; - result = - (*PanoramiXSaveRenderVector[X_RenderColorTrapezoids]) (client); - - if(result != Success) break; - } - - xfree(extra); - } - - return result; -} - -static int -PanoramiXRenderColorTriangles(ClientPtr client) -{ - PanoramiXRes *src, *dst; - int result = Success, j; - REQUEST(xRenderColorTrianglesReq); - char *extra; - int extra_len; - - REQUEST_AT_LEAST_SIZE (xRenderColorTrianglesReq); - - VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, - RenderErrBase + BadPicture); - - extra_len = (client->req_len << 2) - sizeof (xRenderColorTrianglesReq); - - if (extra_len && - (extra = (char *) xalloc (extra_len))) { - memcpy (extra, stuff + 1, extra_len); - - FOR_NSCREENS_FORWARD(j) { - if (j) memcpy (stuff + 1, extra, extra_len); - if (dst->u.pict.root) { - int x_off = panoramiXdataPtr[j].x; - int y_off = panoramiXdataPtr[j].y; - - if(x_off || y_off) { - ....; - } - } - - stuff->dst = dst->info[j].id; - result = - (*PanoramiXSaveRenderVector[X_RenderColorTriangles]) (client); - - if(result != Success) break; - } - - xfree(extra); - } - - return result; -} - -#endif - static int PanoramiXRenderAddTraps (ClientPtr client) { |