From 22c0af3d0e6b5f8d13798b3d6229e1864653be8d Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 16 Jan 2000 06:55:09 +0000 Subject: [PATCH] mismatched ()s don't help. --- common/dga_check.c | 4 ++-- common/gl_vidglx.c | 18 +++++++++--------- common/gl_vidlinuxglx.c | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/common/dga_check.c b/common/dga_check.c index ab938ec..683feb3 100644 --- a/common/dga_check.c +++ b/common/dga_check.c @@ -47,7 +47,7 @@ int VID_CheckDGA(Display *dpy, int *maj_ver, int *min_ver, int *hasvideo) { -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) int event_base, error_base, dgafeat, dummy; if (! XF86DGAQueryExtension(dpy, &event_base, &error_base)) { @@ -81,7 +81,7 @@ VID_CheckDGA(Display *dpy, int *maj_ver, int *min_ver, int *hasvideo) int VID_CheckVMode(Display *dpy, int *maj_ver, int *min_ver) { -#if (defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) XF86VidModeModeInfo **vidmodes; int event_base, error_base; int dummy; diff --git a/common/gl_vidglx.c b/common/gl_vidglx.c index 4d0a22c..498879d 100644 --- a/common/gl_vidglx.c +++ b/common/gl_vidglx.c @@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) #include #include #endif @@ -74,7 +74,7 @@ static float old_mouse_x, old_mouse_y; static int mouse_grabbed = 0; #define mouse_shouldgrab ((int)vid_glx_fullscreen.value ||(int)_windowed_mouse.value) -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) static int nummodes; static XF86VidModeModeInfo **vidmodes; static int hasdga = 0, hasdgavideo = 0, hasvidmode = 0; @@ -171,7 +171,7 @@ do_grabs(int grab) XGrabKeyboard(dpy, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) if (hasdga) { XF86DGADirectVideo(dpy, screen, XF86DGADirectMouse); dgamouse = 1; @@ -186,7 +186,7 @@ do_grabs(int grab) /* Release grab */ -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) if (dgamouse) { XF86DGADirectVideo(dpy, screen, 0); dgamouse = 0; @@ -218,7 +218,7 @@ do_fullscreen(int full) return; } #endif -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) if (hasvidmode) { static int prev_x = 0, prev_y = 0, prev_w = 640, prev_h = 480; @@ -280,7 +280,7 @@ VID_Shutdown(void) glXDestroyContext(dpy, ctx); ctx = NULL; -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) if (hasvidmode) { int i; @@ -532,7 +532,7 @@ void VID_Init(unsigned char *palette) Cvar_RegisterVariable(&gl_ztrick); Cvar_RegisterVariable(&_windowed_mouse); Cvar_RegisterVariable(&vid_glx_fullscreen); -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) Cvar_RegisterVariable(&vid_dga_mouseaccel); #endif @@ -581,7 +581,7 @@ void VID_Init(unsigned char *palette) exit(1); } -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) { int maj_ver; @@ -815,7 +815,7 @@ GetEvent(void) break; case MotionNotify: -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) if (dgamouse) { mouse_x += (float)x_event.xmotion.x_root * vid_dga_mouseaccel.value; diff --git a/common/gl_vidlinuxglx.c b/common/gl_vidlinuxglx.c index fb2532d..5bc3e04 100644 --- a/common/gl_vidlinuxglx.c +++ b/common/gl_vidlinuxglx.c @@ -74,7 +74,7 @@ static float old_mouse_x, old_mouse_y; static int mouse_grabbed = 0; #define mouse_shouldgrab ((int)vid_glx_fullscreen.value ||(int)_windowed_mouse.value) -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) static int nummodes; static XF86VidModeModeInfo **vidmodes; static int hasdga = 0, hasdgavideo = 0, hasvidmode = 0; @@ -303,7 +303,7 @@ do_grabs(int grab) XGrabKeyboard(dpy, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) if (hasdga) { XF86DGADirectVideo(dpy, screen, XF86DGADirectMouse); dgamouse = 1; @@ -318,7 +318,7 @@ do_grabs(int grab) /* Release grab */ -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) if (dgamouse) { XF86DGADirectVideo(dpy, screen, 0); dgamouse = 0; @@ -350,7 +350,7 @@ do_fullscreen(int full) return; } #endif -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) if (hasvidmode) { static int prev_x = 0, prev_y = 0, prev_w = 640, prev_h = 480; @@ -422,7 +422,7 @@ GetEvent(void) break; case MotionNotify: -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) if (dgamouse) { mouse_x += (float)x_event.xmotion.x_root * vid_dga_mouseaccel.value; @@ -515,7 +515,7 @@ VID_Shutdown(void) glXDestroyContext(dpy, ctx); ctx = NULL; -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) if (hasvidmode) { int i; @@ -769,7 +769,7 @@ void VID_Init(unsigned char *palette) Cvar_RegisterVariable(&gl_ztrick); Cvar_RegisterVariable(&_windowed_mouse); Cvar_RegisterVariable(&vid_glx_fullscreen); -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) Cvar_RegisterVariable(&vid_dga_mouseaccel); #endif @@ -818,7 +818,7 @@ void VID_Init(unsigned char *palette) exit(1); } -#if defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(HAS_DGA) && defined(_EXPERIMENTAL_) { int maj_ver; @@ -994,7 +994,7 @@ void VID_ExtraOptionCmd(int option_cursor) Cvar_SetValue("_windowed_mouse", !_windowed_mouse.value); break; -#if defined(XMESA) || (defined(HAS_DGA) && defined(_EXPERIMENTAL_)) +#if defined(XMESA) || (defined(HAS_DGA) && defined(_EXPERIMENTAL_) case 2: Cvar_SetValue ("vid_glx_fullscreen",!vid_glx_fullscreen.value); break;