diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-03-06 15:32:13 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-03-06 17:05:03 -0500 |
| commit | a7cd53deb99957dec27a55ffd75e548b322ae0ce (patch) | |
| tree | e6bcdc483b086b3336725f3d654932ddcd579a29 /hw/dmx | |
| parent | 024bbc7cbb924daaf3e305ddfc8e74509acd1e15 (diff) | |
remove PIXPRIV checks as this flag is always set.
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/dmxpixmap.c | 4 | ||||
| -rw-r--r-- | hw/dmx/dmxscrinit.c | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/hw/dmx/dmxpixmap.c b/hw/dmx/dmxpixmap.c index 4a669fdd9..934060675 100644 --- a/hw/dmx/dmxpixmap.c +++ b/hw/dmx/dmxpixmap.c @@ -49,15 +49,11 @@ /** Initialize a private area in \a pScreen for pixmap information. */ Bool dmxInitPixmap(ScreenPtr pScreen) { -#ifdef PIXPRIV if (!AllocatePixmapPrivate(pScreen, dmxPixPrivateIndex, sizeof(dmxPixPrivRec))) return FALSE; return TRUE; -#else -#error Must define PIXPRIV to compile DMX X server -#endif } /** Create a pixmap on the back-end server. */ diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c index 5bfb4df0a..7c315d89f 100644 --- a/hw/dmx/dmxscrinit.c +++ b/hw/dmx/dmxscrinit.c @@ -70,9 +70,7 @@ static unsigned long *dmxCursorGeneration; int dmxGCPrivateIndex; /**< Private index for GCs */ int dmxWinPrivateIndex; /**< Private index for Windows */ -#ifdef PIXPRIV int dmxPixPrivateIndex; /**< Private index for Pixmaps */ -#endif int dmxFontPrivateIndex; /**< Private index for Fonts */ int dmxScreenPrivateIndex; /**< Private index for Screens */ int dmxColormapPrivateIndex; /**< Private index for Colormaps */ @@ -233,14 +231,10 @@ Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[]) if (dmxWinPrivateIndex == -1) return FALSE; -#ifdef PIXPRIV /* Allocate pixmap private index */ dmxPixPrivateIndex = AllocatePixmapPrivateIndex(); if (dmxPixPrivateIndex == -1) return FALSE; -#else -#error Must define PIXPRIV to compile DMX X server -#endif /* Allocate font private index */ dmxFontPrivateIndex = AllocateFontPrivateIndex(); |