Complete.Org: Mailing Lists: Archives: freeciv-dev: September 2004:
[Freeciv-Dev] (PR#10397) Xaw: remove REPORT_CITYNAME_ABBREV from cityrep
Home

[Freeciv-Dev] (PR#10397) Xaw: remove REPORT_CITYNAME_ABBREV from cityrep

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients: ;
Subject: [Freeciv-Dev] (PR#10397) Xaw: remove REPORT_CITYNAME_ABBREV from cityrep.c
From: "Egor Vyscrebentsov via RT" <evyscr@xxxxxxxxx>
Date: Thu, 30 Sep 2004 15:01:05 -0700
Reply-to: RT_CorrespondAddressNotSet@xxxxxxxxxxxxxx

<URL: http://RT::WebBaseURL.not.configured:80/Ticket/Display.html?id=10397 >

Good daytime!

Due to #10149 Xaw client is no longer compile:
/home/freeciv/client/gui-xaw/cityrep.c: In function
`city_report_dialog_update_city':
/home/freeciv/client/gui-xaw/cityrep.c:602: error:
`REPORT_CITYNAME_ABBREV' undeclared (first use in this function)

Attached patch allows Xaw client to be compiled again.

Thanks, evyscr.
diff -urN freeciv-orig/client/gui-xaw/cityrep.c freeciv/client/gui-xaw/cityrep.c
--- freeciv-orig/client/gui-xaw/cityrep.c       2004-09-29 20:23:30 +0400
+++ freeciv/client/gui-xaw/cityrep.c    2004-10-01 01:15:57 +0400
@@ -600,8 +600,8 @@
 
       XtVaGetValues(city_list, XtNnumberStrings, &n, XtNlist, &list, NULL);
       if (0 != strncmp(pcity->name, list[i],
-                      MIN(strlen(pcity->name), REPORT_CITYNAME_ABBREV - 1))) {
-        break;
+                      MIN(strlen(pcity->name), strlen(list[i])))) {
+       break;
       }
       get_city_text(pcity, new_city_line, sizeof(new_city_line));
       if(strcmp(new_city_line, list[i])==0) return; /* no change */

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#10397) Xaw: remove REPORT_CITYNAME_ABBREV from cityrep.c, Egor Vyscrebentsov via RT <=