3.7 X11 collission with variable 'g'

diff --git a/win/X11/winX.c b/win/X11/winX.c
index dff0eafa36ec8cdd31d26561716f2823b14da0de..85725d144044b6dc21fec09bbab92fbfd46e58fd 100644 (file)
--- a/win/X11/winX.c
+++ b/win/X11/winX.c
@@ -2583,12 +2583,12 @@ init_standard_windows()
 }
 
 void
-nh_XtPopup(w, g, childwid)
+nh_XtPopup(w, grb, childwid)
 Widget w;        /* widget */
-int g;           /* type of grab */
+int grb;         /* type of grab */
 Widget childwid; /* child to receive focus (can be None) */
 {
-    XtPopup(w, (XtGrabKind) g);
+    XtPopup(w, (XtGrabKind) grb);
     XSetWMProtocols(XtDisplay(w), XtWindow(w), &wm_delete_window, 1);
     if (appResources.autofocus)
         XtSetKeyboardFocus(toplevel, childwid);

diff --git a/win/X11/winmisc.c b/win/X11/winmisc.c
index b73c9789c27498318a60c2cb81772e14f3c3b373..c1c32ca8e1d8df1e932bddbd2692414de7216e5d 100644 (file)
--- a/win/X11/winmisc.c
+++ b/win/X11/winmisc.c
@@ -500,7 +500,7 @@ X11_player_selection_randomize()
 {
     int nrole = plsel_n_roles;
     int nrace = plsel_n_races;
-    int ro, ra, a, g;
+    int ro, ra, al, ge;
     boolean fully_specified_role, choose_race_first;
     boolean picksomething = (flags.initrole == ROLE_NONE
                              || flags.initrace == ROLE_NONE
@@ -543,7 +543,7 @@ X11_player_selection_randomize()
         choose_race_first = TRUE;
     }
 
-    while (!validrace(ro,ra)) {
+    while (!validrace(ro, ra)) {
         if (choose_race_first) {
             ro = rn2(nrole);
             if (flags.initrole != ROLE_RANDOM) {
@@ -557,26 +557,26 @@ X11_player_selection_randomize()
         }
     }
 
-    g = flags.initgend;
-    if (g == ROLE_NONE) {
-        g = rn2(ROLE_GENDERS);
+    ge = flags.initgend;
+    if (ge == ROLE_NONE) {
+        ge = rn2(ROLE_GENDERS);
         fully_specified_role = FALSE;
     }
-    while (!validgend(ro,ra,g)) {
-        g = rn2(ROLE_GENDERS);
+    while (!validgend(ro, ra, ge)) {
+        ge = rn2(ROLE_GENDERS);
     }
 
-    a = flags.initalign;
-    if (a == ROLE_NONE) {
-        a = rn2(ROLE_ALIGNS);
+    al = flags.initalign;
+    if (al == ROLE_NONE) {
+        al = rn2(ROLE_ALIGNS);
         fully_specified_role = FALSE;
     }
-    while (!validalign(ro,ra,a)) {
-        a = rn2(ROLE_ALIGNS);
+    while (!validalign(ro, ra, al)) {
+        al = rn2(ROLE_ALIGNS);
     }
 
-    XawToggleSetCurrent(plsel_gend_radios[0], i2xtp(g + 1));
-    XawToggleSetCurrent(plsel_align_radios[0], i2xtp(a + 1));
+    XawToggleSetCurrent(plsel_gend_radios[0], i2xtp(ge + 1));
+    XawToggleSetCurrent(plsel_align_radios[0], i2xtp(al + 1));
     XawToggleSetCurrent(plsel_race_radios[0], i2xtp(ra + 1));
     XawToggleSetCurrent(plsel_role_radios[0], i2xtp(ro + 1));
     plsel_set_sensitivities(FALSE);