drop obsolete check for HAS_DEVPRIVATEKEYREC

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

src/sna/sna_glyphs.c

@@ -128,11 +128,7 @@ static inline struct sna_glyph *sna_glyph0(GlyphPtr glyph)
 
 static inline bool can_use_glyph0(void)
 {
-#if HAS_DEVPRIVATEKEYREC
 	return sna_glyph_key.offset == 0;
-#else
-	return 0;
-#endif
 }
 
 #define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0)

src/uxa/intel_dri.c

@@ -75,11 +75,7 @@ typedef struct {
 	PixmapPtr pixmap;
 } I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
 
-#if HAS_DEVPRIVATEKEYREC
 static DevPrivateKeyRec i830_client_key;
-#else
-static int i830_client_key;
-#endif
 
 static void I830DRI2FlipEventHandler(unsigned int frame,
 				     unsigned int tv_sec,

src/uxa/intel_uxa.c

@@ -84,11 +84,7 @@ static const int I830PatternROP[16] = {
 	ROP_1
 };
 
-#if HAS_DEVPRIVATEKEYREC
 DevPrivateKeyRec uxa_pixmap_index;
-#else
-int uxa_pixmap_index;
-#endif
 
 static void
 gen6_context_switch(intel_screen_private *intel,

src/uxa/intel_uxa.h

@@ -42,19 +42,11 @@ struct intel_uxa_pixmap {
 #define PIN_PRIME 0x8
 };
 
-#if HAS_DEVPRIVATEKEYREC
 extern DevPrivateKeyRec uxa_pixmap_index;
-#else
-extern int uxa_pixmap_index;
-#endif
 
 static inline struct intel_uxa_pixmap *intel_uxa_get_pixmap_private(PixmapPtr pixmap)
 {
-#if HAS_DEVPRIVATEKEYREC
 	return dixGetPrivate(&pixmap->devPrivates, &uxa_pixmap_index);
-#else
-	return dixLookupPrivate(&pixmap->devPrivates, &uxa_pixmap_index);
-#endif
 }
 
 static inline Bool intel_uxa_pixmap_is_busy(struct intel_uxa_pixmap *priv)

src/uxa/uxa-glyphs.c

@@ -82,19 +82,11 @@ struct uxa_glyph {
 	uint16_t size, pos;
 };
 
-#if HAS_DEVPRIVATEKEYREC
 static DevPrivateKeyRec uxa_glyph_key;
-#else
-static int uxa_glyph_key;
-#endif
 
 static inline struct uxa_glyph *uxa_glyph_get_private(GlyphPtr glyph)
 {
-#if HAS_DEVPRIVATEKEYREC
 	return dixGetPrivate(&glyph->devPrivates, &uxa_glyph_key);
-#else
-	return dixLookupPrivate(&glyph->devPrivates, &uxa_glyph_key);
-#endif
 }
 
 static inline void uxa_glyph_set_private(GlyphPtr glyph, struct uxa_glyph *priv)

src/uxa/uxa-priv.h

@@ -154,19 +154,11 @@ typedef struct {
     (PixmapWidthPaddingInfo[d].padRoundUp+1)))
 #endif
 
-#if HAS_DEVPRIVATEKEYREC
 extern DevPrivateKeyRec uxa_screen_index;
-#else
-extern int uxa_screen_index;
-#endif
 
 static inline uxa_screen_t *uxa_get_screen(ScreenPtr screen)
 {
-#if HAS_DEVPRIVATEKEYREC
 	return dixGetPrivate(&screen->devPrivates, &uxa_screen_index);
-#else
-	return dixLookupPrivate(&screen->devPrivates, &uxa_screen_index);
-#endif
 }
 
 /** Align an offset to an arbitrary alignment */

src/uxa/uxa.c

@@ -39,11 +39,7 @@
 #include "dixfontstr.h"
 #include "uxa.h"
 
-#if HAS_DEVPRIVATEKEYREC
 DevPrivateKeyRec uxa_screen_index;
-#else
-int uxa_screen_index;
-#endif
 
 /**
  * uxa_get_drawable_pixmap() returns a backing pixmap for a given drawable.