[netrek-cvs] server/Vanilla/robots inl.c,1.1,1.2

[James Cameron]

Update of /cvsroot/netrek/server/Vanilla/robots
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2338/robots

Modified Files:
	inl.c 
Log Message:
fix compilation warning

Index: inl.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/inl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inl.c	21 Mar 2005 05:23:46 -0000	1.1
+++ inl.c	10 Apr 2006 10:30:44 -0000	1.2
@@ -512,7 +512,7 @@
   return 1;
 }
 
-log(m)
+logmessage(m)
      struct message *m;
 {
   time_t curtime;
@@ -584,12 +584,12 @@
       HandleGenDistr(msg.m_data,msg.m_from,msg.m_recpt,&dist);
       size = makedistress(&dist,buf,distmacro[dist.distype].macro);
       strncpy(msg.m_data,buf,size+1);
-      log(&(msg));
+      logmessage(&(msg));
     } else {
-      log(&(messages[oldmctl]));
+      logmessage(&(messages[oldmctl]));
     }
 #else
-    log(&(messages[oldmctl]));
+    logmessage(&(messages[oldmctl]));
 #endif
   }
 }
@@ -1197,7 +1197,7 @@
   /* Fix planets */
   oldplanets = (struct planet *) malloc(sizeof(struct planet) * MAXPLANETS);
   MCOPY(planets, oldplanets, sizeof(struct planet) * MAXPLANETS);
-#endif nodef
+#endif
 
   /* Dont change the pickup queues around - just close them. */
 #ifdef nodef
@@ -1287,7 +1287,7 @@
 #ifdef nodef
   /* restore galaxy */
   MCOPY(oldplanets, planets, sizeof(struct planet) * MAXPLANETS);
-#endif nodef
+#endif
 
   /* Dont mess with the queue information - it is set correctly in queue.c */
 #ifdef nodef
@@ -1451,7 +1451,7 @@
   inl_planets = (struct planet *) malloc(sizeof(struct planet) * MAXPLANETS);
   /*	MCOPY(planets, oldplanets, sizeof(struct planet) * MAXPLANETS); */
   MCOPY(planets, inl_planets, sizeof(struct planet) * MAXPLANETS);
-#endif nodef
+#endif
 
   inl_stat.flags |= S_TOURNEY;
   inl_stat.flags &= ~(S_PREGAME | S_COUNTDOWN | S_CONFINE);