From 9388195afb4a83cc6818f7b7cd8978f2aa15f913 Mon Sep 17 00:00:00 2001
From: Marcus Sundberg <mackan@stacken.kth.se>
Date: Fri, 14 Jan 2000 22:31:08 +0000
Subject: [PATCH] Made it possible to pass NULL arguments for maj_ver and/or
min_ver.
---
common/dga_check.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/common/dga_check.c b/common/dga_check.c
index 43478a6..3297874 100644
--- a/common/dga_check.c
+++ b/common/dga_check.c
@@ -48,12 +48,15 @@ int
VID_CheckDGA(Display *dpy, int *maj_ver, int *min_ver, int *hasvideo)
{
#ifdef HAS_DGA
- int event_base, error_base, dgafeat;
+ int event_base, error_base, dgafeat, dummy;
if (! XF86DGAQueryExtension(dpy, &event_base, &error_base)) {
return 0;
}
+ if (maj_ver == NULL) maj_ver = &dummy;
+ if (min_ver == NULL) min_ver = &dummy;
+
if (! XF86DGAQueryVersion(dpy, maj_ver, min_ver)) {
return 0;
}
@@ -82,12 +85,15 @@ VID_CheckVMode(Display *dpy, int *maj_ver, int *min_ver, int *num_modes,
#ifdef HAS_DGA
XF86VidModeModeInfo **vidmodes;
int event_base, error_base;
- int ret, i;
+ int ret, dummy, i;
if (! XF86VidModeQueryExtension(dpy, &event_base, &error_base)) {
return 0;
}
+ if (maj_ver == NULL) maj_ver = &dummy;
+ if (min_ver == NULL) min_ver = &dummy;
+
if (! XF86VidModeQueryVersion(dpy, maj_ver, min_ver)) {
return 0;
}