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

Clean up many #if 0.

This commit is contained in:
Adam Jackson 2007-12-02 12:39:05 -05:00
parent 83ba1e167c
commit fa47910045
33 changed files with 3 additions and 575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Xext/EVI.c
View File

@ -35,9 +35,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "EVIstruct.h" #include "EVIstruct.h"
#include "modinit.h" #include "modinit.h"
#if 0
static unsigned char XEVIReqCode = 0;
#endif
static EviPrivPtr eviPriv; static EviPrivPtr eviPriv;
static int static int
@ -182,19 +179,9 @@ EVIResetProc(ExtensionEntry *extEntry)
void void
EVIExtensionInit(INITARGS) 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, if (AddExtension(EVINAME, 0, 0,
ProcEVIDispatch, SProcEVIDispatch, ProcEVIDispatch, SProcEVIDispatch,
EVIResetProc, StandardMinorOpcode)) { EVIResetProc, StandardMinorOpcode)) {
#endif
eviPriv = eviDDXInit(); eviPriv = eviDDXInit();
} }
} }

13
Xext/bigreq.c
View File

@ -41,10 +41,6 @@ from The Open Group.
#include "opaque.h" #include "opaque.h"
#include "modinit.h" #include "modinit.h"
#if 0
static unsigned char XBigReqCode;
#endif
static void BigReqResetProc( static void BigReqResetProc(
ExtensionEntry * /* extEntry */ ExtensionEntry * /* extEntry */
); );
@ -54,18 +50,9 @@ static DISPATCH_PROC(ProcBigReqDispatch);
void void
BigReqExtensionInit(INITARGS) 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, (void) AddExtension(XBigReqExtensionName, 0, 0,
ProcBigReqDispatch, ProcBigReqDispatch, ProcBigReqDispatch, ProcBigReqDispatch,
BigReqResetProc, StandardMinorOpcode); BigReqResetProc, StandardMinorOpcode);
#endif
DeclareExtensionSecurity(XBigReqExtensionName, TRUE); DeclareExtensionSecurity(XBigReqExtensionName, TRUE);
} }

20
Xext/cup.c
View File

@ -51,11 +51,6 @@ static int ProcDispatch(ClientPtr client);
static int SProcDispatch(ClientPtr client); static int SProcDispatch(ClientPtr client);
static void ResetProc(ExtensionEntry* extEntry); static void ResetProc(ExtensionEntry* extEntry);
#if 0
static unsigned char ReqCode = 0;
static int ErrorBase;
#endif
#if defined(WIN32) || defined(TESTWIN32) #if defined(WIN32) || defined(TESTWIN32)
#define HAVE_SPECIAL_DESKTOP_COLORS #define HAVE_SPECIAL_DESKTOP_COLORS
#endif #endif
@ -128,20 +123,6 @@ static xColorItem citems[] = {
void void
XcupExtensionInit (INITARGS) 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, (void) AddExtension (XCUPNAME,
0, 0,
XcupNumberErrors, XcupNumberErrors,
@ -149,7 +130,6 @@ XcupExtensionInit (INITARGS)
SProcDispatch, SProcDispatch,
ResetProc, ResetProc,
StandardMinorOpcode); StandardMinorOpcode);
#endif
/* PC servers initialize the desktop colors (citems) here! */ /* PC servers initialize the desktop colors (citems) here! */
} }

12
Xext/dpms.c
View File

@ -50,9 +50,6 @@ Equipment Corporation.
#include "dpmsproc.h" #include "dpmsproc.h"
#include "modinit.h" #include "modinit.h"
#if 0
static unsigned char DPMSCode;
#endif
static DISPATCH_PROC(ProcDPMSDispatch); static DISPATCH_PROC(ProcDPMSDispatch);
static DISPATCH_PROC(SProcDPMSDispatch); static DISPATCH_PROC(SProcDPMSDispatch);
static DISPATCH_PROC(ProcDPMSGetVersion); static DISPATCH_PROC(ProcDPMSGetVersion);
@ -76,18 +73,9 @@ static void DPMSResetProc(ExtensionEntry* extEntry);
void void
DPMSExtensionInit(INITARGS) 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, (void) AddExtension(DPMSExtensionName, 0, 0,
ProcDPMSDispatch, SProcDPMSDispatch, ProcDPMSDispatch, SProcDPMSDispatch,
DPMSResetProc, StandardMinorOpcode); DPMSResetProc, StandardMinorOpcode);
#endif
} }
/*ARGSUSED*/ /*ARGSUSED*/

7
Xext/fontcache.c
View File

@ -67,10 +67,6 @@ static DISPATCH_PROC(SProcFontCacheGetCacheStatistics);
static DISPATCH_PROC(SProcFontCacheQueryVersion); static DISPATCH_PROC(SProcFontCacheQueryVersion);
static DISPATCH_PROC(SProcFontCacheChangeCacheSettings); static DISPATCH_PROC(SProcFontCacheChangeCacheSettings);
#if 0
static unsigned char FontCacheReqCode = 0;
#endif
void void
FontCacheExtensionInit(INITARGS) FontCacheExtensionInit(INITARGS)
{ {
@ -84,9 +80,6 @@ FontCacheExtensionInit(INITARGS)
SProcFontCacheDispatch, SProcFontCacheDispatch,
FontCacheResetProc, FontCacheResetProc,
StandardMinorOpcode))) { StandardMinorOpcode))) {
#if 0
FontCacheReqCode = (unsigned char)extEntry->base;
#endif
miscErrorBase = extEntry->errorBase; miscErrorBase = extEntry->errorBase;
} }
} }

6
Xext/mbuf.c
View File

@ -59,9 +59,6 @@ in this Software without prior written authorization from The Open Group.
#define ValidEventMasks (ExposureMask|MultibufferClobberNotifyMask|MultibufferUpdateNotifyMask) #define ValidEventMasks (ExposureMask|MultibufferClobberNotifyMask|MultibufferUpdateNotifyMask)
#if 0
static unsigned char MultibufferReqCode;
#endif
static int MultibufferEventBase; static int MultibufferEventBase;
static int MultibufferErrorBase; static int MultibufferErrorBase;
int MultibufferScreenIndex = -1; int MultibufferScreenIndex = -1;
@ -247,9 +244,6 @@ MultibufferExtensionInit()
ProcMultibufferDispatch, SProcMultibufferDispatch, ProcMultibufferDispatch, SProcMultibufferDispatch,
MultibufferResetProc, StandardMinorOpcode))) MultibufferResetProc, StandardMinorOpcode)))
{ {
#if 0
MultibufferReqCode = (unsigned char)extEntry->base;
#endif
MultibufferEventBase = extEntry->eventBase; MultibufferEventBase = extEntry->eventBase;
MultibufferErrorBase = extEntry->errorBase; MultibufferErrorBase = extEntry->errorBase;
EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent; EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent;

13
Xext/mitmisc.c
View File

@ -42,10 +42,6 @@ in this Software without prior written authorization from The Open Group.
#include <X11/extensions/mitmiscstr.h> #include <X11/extensions/mitmiscstr.h>
#include "modinit.h" #include "modinit.h"
#if 0
static unsigned char MITReqCode;
#endif
static void MITResetProc( static void MITResetProc(
ExtensionEntry * /* extEntry */ ExtensionEntry * /* extEntry */
); );
@ -60,18 +56,9 @@ static DISPATCH_PROC(SProcMITSetBugMode);
void void
MITMiscExtensionInit(INITARGS) 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, (void) AddExtension(MITMISCNAME, 0, 0,
ProcMITDispatch, SProcMITDispatch, ProcMITDispatch, SProcMITDispatch,
MITResetProc, StandardMinorOpcode); MITResetProc, StandardMinorOpcode);
#endif
} }
/*ARGSUSED*/ /*ARGSUSED*/

7
Xext/panoramiX.c
View File

@ -65,9 +65,6 @@ extern VisualPtr glxMatchVisual(ScreenPtr pScreen,
ScreenPtr pMatchScreen); ScreenPtr pMatchScreen);
#endif #endif
#if 0
static unsigned char PanoramiXReqCode = 0;
#endif
/* /*
* PanoramiX data declarations * PanoramiX data declarations
*/ */
@ -471,10 +468,6 @@ void PanoramiXExtensionInit(int argc, char *argv[])
break; break;
} }
#if 0
PanoramiXReqCode = (unsigned char)extEntry->base;
#endif
/* /*
* First make sure all the basic allocations succeed. If not, * First make sure all the basic allocations succeed. If not,
* run in non-PanoramiXeen mode. * run in non-PanoramiXeen mode.

4
Xext/panoramiXSwap.c
View File

@ -41,10 +41,6 @@ Equipment Corporation.
#include "window.h" #include "window.h"
#include "windowstr.h" #include "windowstr.h"
#include "pixmapstr.h" #include "pixmapstr.h"
#if 0
#include <sys/workstation.h>
#include <X11/Xserver/ws.h>
#endif
#include "panoramiX.h" #include "panoramiX.h"
#include <X11/extensions/panoramiXproto.h> #include <X11/extensions/panoramiXproto.h>
#include "panoramiXsrv.h" #include "panoramiXsrv.h"

10
Xext/panoramiXprocs.c
View File

@ -54,16 +54,6 @@ Equipment Corporation.
#define INPUTONLY_LEGAL_MASK (CWWinGravity | CWEventMask | \ #define INPUTONLY_LEGAL_MASK (CWWinGravity | CWEventMask | \
CWDontPropagate | CWOverrideRedirect | CWCursor ) 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 /* Various of the DIX function interfaces were not designed to allow
* the client->errorValue to be set on BadValue and other errors. * the client->errorValue to be set on BadValue and other errors.
* Rather than changing interfaces and breaking untold code we introduce * Rather than changing interfaces and breaking untold code we introduce

6
Xext/saver.c
View File

@ -61,9 +61,6 @@ in this Software without prior written authorization from the X Consortium.
#include "modinit.h" #include "modinit.h"
#if 0
static unsigned char ScreenSaverReqCode = 0;
#endif
static int ScreenSaverEventBase = 0; static int ScreenSaverEventBase = 0;
static DISPATCH_PROC(ProcScreenSaverQueryInfo); static DISPATCH_PROC(ProcScreenSaverQueryInfo);
@ -272,9 +269,6 @@ ScreenSaverExtensionInit(INITARGS)
ProcScreenSaverDispatch, SProcScreenSaverDispatch, ProcScreenSaverDispatch, SProcScreenSaverDispatch,
ScreenSaverResetProc, StandardMinorOpcode))) ScreenSaverResetProc, StandardMinorOpcode)))
{ {
#if 0
ScreenSaverReqCode = (unsigned char)extEntry->base;
#endif
ScreenSaverEventBase = extEntry->eventBase; ScreenSaverEventBase = extEntry->eventBase;
EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent; EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
} }

6
Xext/shape.c
View File

@ -111,9 +111,6 @@ static DISPATCH_PROC(SProcShapeSelectInput);
#include "panoramiXsrv.h" #include "panoramiXsrv.h"
#endif #endif
#if 0
static unsigned char ShapeReqCode = 0;
#endif
static int ShapeEventBase = 0; static int ShapeEventBase = 0;
static RESTYPE ClientType, EventType; /* resource types for event masks */ static RESTYPE ClientType, EventType; /* resource types for event masks */
@ -154,9 +151,6 @@ ShapeExtensionInit(void)
ProcShapeDispatch, SProcShapeDispatch, ProcShapeDispatch, SProcShapeDispatch,
ShapeResetProc, StandardMinorOpcode))) ShapeResetProc, StandardMinorOpcode)))
{ {
#if 0
ShapeReqCode = (unsigned char)extEntry->base;
#endif
ShapeEventBase = extEntry->eventBase; ShapeEventBase = extEntry->eventBase;
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent; EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
} }

13
Xext/xcmisc.c
View File

@ -48,10 +48,6 @@ from The Open Group.
#define UINT32_MAX 0xffffffffU #define UINT32_MAX 0xffffffffU
#endif #endif
#if 0
static unsigned char XCMiscCode;
#endif
static void XCMiscResetProc( static void XCMiscResetProc(
ExtensionEntry * /* extEntry */ ExtensionEntry * /* extEntry */
); );
@ -68,18 +64,9 @@ static DISPATCH_PROC(SProcXCMiscGetXIDRange);
void void
XCMiscExtensionInit(INITARGS) 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, (void) AddExtension(XCMiscExtensionName, 0, 0,
ProcXCMiscDispatch, SProcXCMiscDispatch, ProcXCMiscDispatch, SProcXCMiscDispatch,
XCMiscResetProc, StandardMinorOpcode); XCMiscResetProc, StandardMinorOpcode);
#endif
DeclareExtensionSecurity(XCMiscExtensionName, TRUE); DeclareExtensionSecurity(XCMiscExtensionName, TRUE);
} }

17
Xext/xf86bigfont.c
View File

@ -86,10 +86,6 @@ static DISPATCH_PROC(SProcXF86BigfontDispatch);
static DISPATCH_PROC(SProcXF86BigfontQueryVersion); static DISPATCH_PROC(SProcXF86BigfontQueryVersion);
static DISPATCH_PROC(SProcXF86BigfontQueryFont); static DISPATCH_PROC(SProcXF86BigfontQueryFont);
#if 0
static unsigned char XF86BigfontReqCode;
#endif
#ifdef HAS_SHM #ifdef HAS_SHM
/* A random signature, transmitted to the clients so they can verify that the /* A random signature, transmitted to the clients so they can verify that the
@ -149,18 +145,6 @@ CheckForShmSyscall(void)
void void
XFree86BigfontExtensionInit() XFree86BigfontExtensionInit()
{ {
#if 0
ExtensionEntry* extEntry;
if ((extEntry = AddExtension(XF86BIGFONTNAME,
XF86BigfontNumberEvents,
XF86BigfontNumberErrors,
ProcXF86BigfontDispatch,
SProcXF86BigfontDispatch,
XF86BigfontResetProc,
StandardMinorOpcode))) {
XF86BigfontReqCode = (unsigned char) extEntry->base;
#else
if (AddExtension(XF86BIGFONTNAME, if (AddExtension(XF86BIGFONTNAME,
XF86BigfontNumberEvents, XF86BigfontNumberEvents,
XF86BigfontNumberErrors, XF86BigfontNumberErrors,
@ -168,7 +152,6 @@ XFree86BigfontExtensionInit()
SProcXF86BigfontDispatch, SProcXF86BigfontDispatch,
XF86BigfontResetProc, XF86BigfontResetProc,
StandardMinorOpcode)) { StandardMinorOpcode)) {
#endif
#ifdef HAS_SHM #ifdef HAS_SHM
#ifdef MUST_CHECK_FOR_SHM_SYSCALL #ifdef MUST_CHECK_FOR_SHM_SYSCALL
/* /*

19
Xext/xprint.c
View File

@ -389,25 +389,6 @@ XpCloseScreen(int index, ScreenPtr pScreen)
return (*CloseScreen)(index, 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 * XpRegisterInitFunc tells the print extension which screens
* are printers as opposed to displays, and what drivers are * are printers as opposed to displays, and what drivers are

13
Xext/xtest.c
View File

@ -54,10 +54,6 @@ from The Open Group.
#include "modinit.h" #include "modinit.h"
#if 0
static unsigned char XTestReqCode;
#endif
#ifdef XINPUT #ifdef XINPUT
extern int DeviceValuator; extern int DeviceValuator;
#endif /* XINPUT */ #endif /* XINPUT */
@ -89,18 +85,9 @@ static DISPATCH_PROC(SProcXTestGrabControl);
void void
XTestExtensionInit(INITARGS) 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, (void) AddExtension(XTestExtensionName, 0, 0,
ProcXTestDispatch, SProcXTestDispatch, ProcXTestDispatch, SProcXTestDispatch,
XTestResetProc, StandardMinorOpcode); XTestResetProc, StandardMinorOpcode);
#endif
} }
/*ARGSUSED*/ /*ARGSUSED*/

1
cfb/Makefile.am
View File

@ -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 \ EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \
cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \ cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \
cfb16.h cfb24.h cfb32.h cfb8bit.h cfbrrop.h \ cfb16.h cfb24.h cfb32.h cfb8bit.h cfbrrop.h \
cfbtab.h \
stip68kgnu.h stipmips.s stipsparc.s stipsprc32.s stip68kgnu.h stipmips.s stipsparc.s stipsprc32.s
sdk_HEADERS = cfb.h cfb32.h cfb16.h cfbmap.h cfbunmap.h cfbmskbits.h sdk_HEADERS = cfb.h cfb32.h cfb16.h cfbmap.h cfbunmap.h cfbmskbits.h

4
cfb/cfbcppl.c
View File

@ -42,9 +42,7 @@ in this Software without prior written authorization from The Open Group.
#include "maskbits.h" #include "maskbits.h"
#define PSZ 8 #define PSZ 8
#include "mergerop.h" #include "mergerop.h"
#else /* PSZ==8 */ #endif
#include "cfbtab.h" /* provides starttab, endttab, partmasks */
#endif /* PSZ==8 */
void void

126
cfb/cfbmap.h
View File

@ -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 * 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 */ /* a losing vendor cpp dumps core if we define CFBNAME in terms of CATNAME */
#if PSZ != 8 #if PSZ != 8

37
cfb/cfbmskbits.h
View File

@ -831,42 +831,6 @@ if ((x) + (w) <= PPW) {\
*(destpix) = (*(psrcpix)) & QuartetPixelMaskTable[q]; \ *(destpix) = (*(psrcpix)) & QuartetPixelMaskTable[q]; \
} }
#if PSZ == 24 #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) \ #define getstipplepixels24(psrcstip,xt,ones,psrcpix,destpix,stipindex) \
{ \ { \
PixelGroup q; \ PixelGroup q; \
@ -874,7 +838,6 @@ if ((x) + (w) <= PPW) {\
q = ((ones) ? q : ~q) & 1; \ q = ((ones) ? q : ~q) & 1; \
*(destpix) = (*(psrcpix)) & QuartetPixelMaskTable[q]; \ *(destpix) = (*(psrcpix)) & QuartetPixelMaskTable[q]; \
} }
# endif
#endif /* PSZ == 24 */ #endif /* PSZ == 24 */
#endif #endif

14
cfb/cfbtab.h
View File

@ -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_ */

20
dbe/dbe.c
View File

@ -160,26 +160,6 @@ DbeAllocWinPriv(ScreenPtr pScreen)
} /* DbeAllocWinPriv() */ } /* DbeAllocWinPriv() */
/******************************************************************************
*
* 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
/****************************************************************************** /******************************************************************************
* *

7
dix/window.c
View File

@ -145,13 +145,6 @@ _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF;
_X_EXPORT ScreenSaverStuffRec savedScreenInfo[MAXSCREENS]; _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); static Bool TileScreenSaver(int i, int kind);

3
fb/fbblt.c
View File

@ -825,9 +825,6 @@ fbBltOdd24 (FbBits *srcLine,
even = TRUE; even = TRUE;
} }
} }
#if 0
fprintf (stderr, "\n");
#endif
} }
#endif #endif

22
include/dixevents.h
View File

@ -41,28 +41,6 @@ extern int MaybeDeliverEventsToClient(
extern int ProcWarpPointer(ClientPtr /* client */); 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( extern int EventSelectForWindow(
WindowPtr /* pWin */, WindowPtr /* pWin */,
ClientPtr /* client */, ClientPtr /* client */,

11
include/swapreq.h
View File

@ -26,17 +26,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SWAPREQ_H #ifndef SWAPREQ_H
#define SWAPREQ_H 1 #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( extern void SwapColorItem(
xColorItem * /* pItem */); xColorItem * /* pItem */);

3
mi/midispcur.c
View File

@ -182,9 +182,6 @@ miDCCloseScreen (index, pScreen)
tossPix (pScreenPriv->pSave); tossPix (pScreenPriv->pSave);
tossPix (pScreenPriv->pTemp); tossPix (pScreenPriv->pTemp);
#ifdef ARGB_CURSOR #ifdef ARGB_CURSOR
#if 0 /* This has been free()d before */
tossPict (pScreenPriv->pRootPicture);
#endif
tossPict (pScreenPriv->pTempPicture); tossPict (pScreenPriv->pTempPicture);
#endif #endif
xfree ((pointer) pScreenPriv); xfree ((pointer) pScreenPriv);

3
miext/damage/damage.c
View File

@ -243,9 +243,6 @@ damageDamageRegion (DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
if (pDamage->pDrawable->type == DRAWABLE_WINDOW && if (pDamage->pDrawable->type == DRAWABLE_WINDOW &&
!((WindowPtr) (pDamage->pDrawable))->realized) !((WindowPtr) (pDamage->pDrawable))->realized)
{ {
#if 0
DAMAGE_DEBUG (("damage while window unrealized\n"));
#endif
continue; continue;
} }

15
os/WaitFor.c
View File

@ -410,21 +410,6 @@ WaitForSomething(int *pClientsReady)
return nready; 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. /* If time has rewound, re-run every affected timer.
* Timers might drop out of the list, so we have to restart every time. */ * Timers might drop out of the list, so we have to restart every time. */
static void static void

5
os/io.c
View File

@ -57,9 +57,8 @@ SOFTWARE.
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#if 0 #undef DEBUG_COMMUNICATION
#define DEBUG_COMMUNICATION
#endif
#ifdef WIN32 #ifdef WIN32
#include <X11/Xwinsock.h> #include <X11/Xwinsock.h>
#endif #endif

4
os/osinit.c
View File

@ -194,10 +194,6 @@ OsInit(void)
rlim.rlim_cur = limitNoFile; rlim.rlim_cur = limitNoFile;
else else
rlim.rlim_cur = rlim.rlim_max; rlim.rlim_cur = rlim.rlim_max;
#if 0
if (rlim.rlim_cur > MAXSOCKS)
rlim.rlim_cur = MAXSOCKS;
#endif
(void)setrlimit(RLIMIT_NOFILE, &rlim); (void)setrlimit(RLIMIT_NOFILE, &rlim);
} }
} }

6
render/picturestr.h
View File

@ -504,12 +504,6 @@ SetPictureToDefaults (PicturePtr pPicture);
PicturePtr PicturePtr
AllocatePicture (ScreenPtr pScreen); AllocatePicture (ScreenPtr pScreen);
#if 0
Bool
miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);
#endif
PicturePtr PicturePtr
CreatePicture (Picture pid, CreatePicture (Picture pid,
DrawablePtr pDrawable, DrawablePtr pDrawable,

118
render/render.c
View File

@ -212,9 +212,6 @@ int (*SProcRenderVector[RenderNumberRequests])(ClientPtr) = {
static void static void
RenderResetProc (ExtensionEntry *extEntry); RenderResetProc (ExtensionEntry *extEntry);
#if 0
static CARD8 RenderReqCode;
#endif
int RenderErrBase; int RenderErrBase;
int RenderClientPrivateIndex; int RenderClientPrivateIndex;
@ -259,9 +256,6 @@ RenderExtensionInit (void)
RenderResetProc, StandardMinorOpcode); RenderResetProc, StandardMinorOpcode);
if (!extEntry) if (!extEntry)
return; return;
#if 0
RenderReqCode = (CARD8) extEntry->base;
#endif
RenderErrBase = extEntry->errorBase; RenderErrBase = extEntry->errorBase;
} }
@ -299,26 +293,6 @@ ProcRenderQueryVersion (ClientPtr client)
return (client->noClientException); 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 static VisualPtr
findVisual (ScreenPtr pScreen, VisualID vid) findVisual (ScreenPtr pScreen, VisualID vid)
{ {
@ -3225,98 +3199,6 @@ PanoramiXRenderTriFan(ClientPtr client)
return result; 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 static int
PanoramiXRenderAddTraps (ClientPtr client) PanoramiXRenderAddTraps (ClientPtr client)
{ {