[Freeciv-Dev] Re: (PR#4224) variable "sun" in client/gui-gtk-2.0/mapview.c

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

Guest wrote:
> In the file client/gui-gtk-2.0/mapview.c, the variable "sun" is used.  I
> believe this must be a reserved keyword on Solaris, since it gives an
> error during compilation.  If I change it to "sun1", the file compiles.

Elsewhere (including gui-gtk) only 'sol' is used, never 'sun'.

IMO neither is particularly descriptive.

jason

Index: client/gui-gtk-2.0/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/mapview.c,v
retrieving revision 1.59
diff -u -r1.59 mapview.c
--- client/gui-gtk-2.0/mapview.c        2003/05/05 12:11:12     1.59
+++ client/gui-gtk-2.0/mapview.c        2003/05/12 19:05:45
@@ -214,7 +214,7 @@
 {
   char buffer  [512];
   int  d;
-  int  sun, flake;
+  int  sol, flake;
 
   gtk_frame_set_label(GTK_FRAME(main_frame_civ_name),
                      get_nation_name(game.player_ptr->nation));
@@ -230,10 +230,10 @@
 
   gtk_set_label(main_label_info, buffer);
 
-  sun = client_warming_sprite();
+  sol = client_warming_sprite();
   flake = client_cooling_sprite();
   set_indicator_icons(client_research_sprite(),
-                     sun,
+                     sol,
                      flake,
                      game.player_ptr->government);
 
@@ -276,7 +276,7 @@
   my_snprintf(buffer, sizeof(buffer),
              _("Shows the progress of global warming:\n"
                "%d."),
-             sun);
+             sol);
   gtk_tooltips_set_tip(main_tips, sun_ebox, buffer, "");
 
   my_snprintf(buffer, sizeof(buffer),