diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/clinet.c freeciv/client/clinet.c
--- FreecivCVS/client/clinet.c	Sat Jul 29 14:38:19 2000
+++ freeciv/client/clinet.c	Sun Aug  6 14:18:53 2000
@@ -129,7 +129,7 @@
     hostname="localhost";
   
   if(isdigit((size_t)*hostname)) {
-    if((address = inet_addr(hostname)) == -1) {
+    if((address = inet_addr(hostname)) == (unsigned long)-1) {
       mystrlcpy(errbuf, _("Invalid hostname"), n_errbuf);
       return -1;
     }
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/options.c freeciv/client/options.c
--- FreecivCVS/client/options.c	Sat Jul 29 14:38:19 2000
+++ freeciv/client/options.c	Sun Aug  6 14:00:15 2000
@@ -269,7 +269,7 @@
   for (i=0; i<E_LAST; i++) {
     messages_where[i] =
       secfile_lookup_int_default(&sf, messages_where[i],
-				 "%s.message_where_%2.2d", prefix, i);
+				 "%s.message_where_%02d", prefix, i);
   }
   for (i=1; i<num_city_report_spec(); i++) {
     int *ip = city_report_spec_show_ptr(i);
@@ -311,7 +311,7 @@
     fprintf(option_file, "%s = %d\n", v->name, *(v->p_value));
   }
   for (i=0; i<E_LAST; i++) {
-    fprintf(option_file, "message_where_%2.2d = %d  # %s\n",
+    fprintf(option_file, "message_where_%02d = %d  # %s\n",
 	   i, messages_where[i], message_text[i]);
   }
   for (i=1; i<num_city_report_spec(); i++) {
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/gamehand.c freeciv/server/gamehand.c
--- FreecivCVS/server/gamehand.c	Thu Aug  3 14:14:53 2000
+++ freeciv/server/gamehand.c	Sun Aug  6 14:13:11 2000
@@ -426,7 +426,7 @@
       char name[20];
       my_snprintf(name, sizeof(name), "random.table%d",i);
       string=secfile_lookup_str(file,name);
-      sscanf(string,"%8X %8X %8X %8X %8X %8X %8X", &rstate.v[7*i],
+      sscanf(string,"%8x %8x %8x %8x %8x %8x %8x", &rstate.v[7*i],
 	     &rstate.v[7*i+1], &rstate.v[7*i+2], &rstate.v[7*i+3],
 	     &rstate.v[7*i+4], &rstate.v[7*i+5], &rstate.v[7*i+6]);
     }
@@ -716,7 +716,7 @@
       char name[20], vec[100];
       my_snprintf(name, sizeof(name), "random.table%d", i);
       my_snprintf(vec, sizeof(vec),
-		  "%8X %8X %8X %8X %8X %8X %8X", rstate.v[7*i],
+		  "%8x %8x %8x %8x %8x %8x %8x", rstate.v[7*i],
 		  rstate.v[7*i+1], rstate.v[7*i+2], rstate.v[7*i+3],
 		  rstate.v[7*i+4], rstate.v[7*i+5], rstate.v[7*i+6]);
       secfile_insert_str(file, vec, name);
@@ -744,5 +744,3 @@
   map_save(file);
 
 }
-
-
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/meta.c freeciv/server/meta.c
--- FreecivCVS/server/meta.c	Sun Mar  5 08:28:45 2000
+++ freeciv/server/meta.c	Sun Aug  6 14:25:29 2000
@@ -190,7 +190,8 @@
   }
 #else
   memset(&serv_addr, 0, sizeof(serv_addr));
-  if ((bad = ((serv_addr.sin_addr.s_addr = inet_addr(servername)) == -1))) {
+  serv_addr.sin_addr.s_addr = inet_addr(servername);
+  if ((bad = (serv_addr.sin_addr.s_addr == (unsigned long)-1))) {
     if (!(bad = ((hp = gethostbyname(servername)) == NULL))) {
       memcpy(&serv_addr.sin_addr.s_addr, hp->h_addr, hp->h_length);
     }