Fixes for compilation with gcc 15

[micropolis] / src / sim / w_x.c

diff --git a/src/sim/w_x.c b/src/sim/w_x.c
index b7cc9e9b0a8d62b2404b1d74bb0b0a2dd89f5191..82ff0a27ea9b6ea72dd142f5469c22a1f107baae 100644 (file)
--- a/src/sim/w_x.c
+++ b/src/sim/w_x.c
@@ -581,7 +581,7 @@ InitNewView(SimView *view, char *title, int class, int w, int h)
   view->update_context = 0;
   view->auto_goto = 0;
   view->auto_going = 0;
-  view->auto_x_goal = view->auto_x_goal = 0;
+  view->auto_x_goal = view->auto_y_goal = 0;
   view->auto_speed = 75;
   view->follow = NULL;
   view->sound = 1;
@@ -906,7 +906,7 @@ DoResizeView(SimView *view, int w, int h)
     }
 
     view->data = (unsigned char *)shmat(view->shminfo->shmid, 0, 0);
-    if ((int)view->data == -1) {
+    if ((char*)view->data == (char*)-1) {
       perror("shmat");
       fprintf(stderr,
              "Darn, Micropolis can't find any memory to share with display \"%s\".\n",
@@ -918,7 +918,7 @@ DoResizeView(SimView *view, int w, int h)
     view->shminfo->shmaddr = (char *)view->data;
     view->shminfo->readOnly = False;
 
-    { int (*old)();
+    { int (*old)(Display *, XErrorEvent *);
       int result;
       int attached = 0;
       GotXError = 0;