summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-04-19 09:26:10 -0700
committerKeith Packard <keithp@keithp.com>2010-04-19 09:26:10 -0700
commit28b7b2b8d02d975480080865f0dddebcaa2f7968 (patch)
tree275bb660082403874d882e8cbc34841efb0a0435 /Xext
parentb3ab978df861c08298f57529e3db980489055c35 (diff)
unifdef -B -DRENDER to always include RENDER code
This patch was created with: git ls-files '*.[ch]' | while read f; do unifdef -B -DRENDER -o $f $f; done Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Xext')
-rw-r--r--Xext/panoramiX.c6
-rw-r--r--Xext/panoramiX.h2
2 files changed, 0 insertions, 8 deletions
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index cfeba017f..96eb8f9e1 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -52,9 +52,7 @@ Equipment Corporation.
#include "globals.h"
#include "servermd.h"
#include "resource.h"
-#ifdef RENDER
#include "picturestr.h"
-#endif
#include "modinit.h"
#include "protocol-versions.h"
@@ -589,9 +587,7 @@ void PanoramiXExtensionInit(int argc, char *argv[])
ProcVector[X_StoreColors] = PanoramiXStoreColors;
ProcVector[X_StoreNamedColor] = PanoramiXStoreNamedColor;
-#ifdef RENDER
PanoramiXRenderInit ();
-#endif
}
extern Bool CreateConnectionBlock(void);
@@ -891,9 +887,7 @@ static void PanoramiXResetProc(ExtensionEntry* extEntry)
{
int i;
-#ifdef RENDER
PanoramiXRenderReset ();
-#endif
screenInfo.numScreens = PanoramiXNumScreens;
for (i = 256; i--; )
ProcVector[i] = SavedProcVector[i];
diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index cca4c5249..463a99441 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -69,11 +69,9 @@ typedef struct {
struct {
Bool shared;
} pix;
-#ifdef RENDER
struct {
Bool root;
} pict;
-#endif
char raw_data[4];
} u;
} PanoramiXRes;