[patch] fix_bool.patch

fix_bool.patch (text/plain), 1.52 KB, created by email200202 on 2021-12-19 13:34:23 UTC

--- a/hw/xfree86/common/xf86Opt.h	2021-12-18 00:12:51.429680510 +1100
+++ b/hw/xfree86/common/xf86Opt.h	2021-12-18 00:13:15.260893084 +1100
@@ -41,7 +41,7 @@
     unsigned long num;
     const char *str;
     double realnum;
-    Bool bool;
+    Bool cbool;
     OptFrequency freq;
 } ValueUnion;
 
--- a/hw/xfree86/common/xf86Option.c	2021-12-18 00:16:45.462768632 +1100
+++ b/hw/xfree86/common/xf86Option.c	2021-12-18 00:18:34.374740750 +1100
@@ -213,7 +213,7 @@
     o.name = name;
     o.type = OPTV_BOOLEAN;
     if (ParseOptionValue(-1, optlist, &o, markUsed))
-        deflt = o.value.bool;
+        deflt = o.value.cbool;
     return deflt;
 }
 
@@ -474,7 +474,7 @@
 static Bool
 GetBoolValue(OptionInfoPtr p, const char *s)
 {
-    return xf86getBoolValue(&p->value.bool, s);
+    return xf86getBoolValue(&p->value.cbool, s);
 }
 
 static Bool
@@ -678,7 +678,7 @@
             if (markUsed)
                 xf86MarkOptionUsedByName(options, newn);
             if (GetBoolValue(&opt, s)) {
-                p->value.bool = !opt.value.bool;
+                p->value.cbool = !opt.value.cbool;
                 p->found = TRUE;
             }
             else {
@@ -869,7 +869,7 @@
 
     p = xf86TokenToOptinfo(table, token);
     if (p && p->found) {
-        *value = p->value.bool;
+        *value = p->value.cbool;
         return TRUE;
     }
     else
@@ -883,7 +883,7 @@
 
     p = xf86TokenToOptinfo(table, token);
     if (p && p->found) {
-        return p->value.bool;
+        return p->value.cbool;
     }
     else
         return def;