min()/max() macros conflict with ones defined by Windows (or at least MinGW)

[sgt/puzzles] / nullgame.c

diff --git a/nullgame.c b/nullgame.c
index abb6cc5..49173b6 100644 (file)
--- a/nullgame.c
+++ b/nullgame.c
@@ -84,7 +84,7 @@ static char *validate_params(game_params *params)
 }
 
 static char *new_game_desc(game_params *params, random_state *rs,
-                          game_aux_info **aux)
+                          game_aux_info **aux, int interactive)
 {
     return dupstr("FIXME");
 }
@@ -142,8 +142,8 @@ static void free_ui(game_ui *ui)
 {
 }
 
-static game_state *make_move(game_state *from, game_ui *ui, int x, int y,
-                            int button)
+static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds,
+                             int x, int y, int button)
 {
     return NULL;
 }
@@ -254,4 +254,5 @@ const struct game thegame = {
     game_flash_length,
     game_wants_statusbar,
     FALSE, game_timing_state,
+    0,                                /* mouse_priorities */
 };