diff vidix/radeon_vid.c @ 27377:d58d06eafe83

Change a bunch of X11-specific preprocessor directives. Switch from a HAVE_ prefix to a CONFIG_ prefix.
author diego
date Mon, 04 Aug 2008 06:16:23 +0000
parents df448e1248b2
children 0f1b5b68af32
line wrap: on
line diff
--- a/vidix/radeon_vid.c	Sun Aug 03 20:17:46 2008 +0000
+++ b/vidix/radeon_vid.c	Mon Aug 04 06:16:23 2008 +0000
@@ -41,7 +41,7 @@
 #include "dha.h"
 #include "radeon.h"
 
-#if !defined(RAGE128) && defined(HAVE_X11)
+#if !defined(RAGE128) && defined(CONFIG_X11)
 #include <X11/Xlib.h>
 static uint32_t firegl_shift = 0;
 #endif
@@ -1168,7 +1168,7 @@
     { 0, 0, 0, 0}
 };
 
-#if !defined(RAGE128) && defined(HAVE_X11)
+#if !defined(RAGE128) && defined(CONFIG_X11)
 static void probe_fireGL_driver(void) {
   Display *dp = XOpenDisplay ((void*)0);
   int n = 0;
@@ -1243,7 +1243,7 @@
 #endif
 	    besr.chip_flags=R_100|R_OVL_SHIFT;
 	}
-#if !defined(RAGE128) && defined(HAVE_X11)
+#if !defined(RAGE128) && defined(CONFIG_X11)
         probe_fireGL_driver();
 #endif
 	if(idx != -1) besr.chip_flags=ati_card_ids[idx].flags;
@@ -3098,7 +3098,7 @@
   for(;nfr>0; nfr--)
   {
       radeon_overlay_off = radeon_video_size - info->frame_size*nfr;
-#if !defined (RAGE128) && defined(HAVE_X11)
+#if !defined (RAGE128) && defined(CONFIG_X11)
       radeon_overlay_off -= firegl_shift;
 #endif
       radeon_overlay_off &= 0xffff0000;
@@ -3110,7 +3110,7 @@
    for(;nfr>0; nfr--)
    {
       radeon_overlay_off = radeon_video_size - info->frame_size*nfr;
-#if !defined (RAGE128) && defined(HAVE_X11)
+#if !defined (RAGE128) && defined(CONFIG_X11)
       radeon_overlay_off -= firegl_shift;
 #endif
       radeon_overlay_off &= 0xffff0000;