(oops): Move declaration to misc.h, to make CANT_HAPPEN() usable

with just misc.h included.

diff --git a/include/misc.h b/include/misc.h
index b0ccc0f279c37ae842489f8520a3a6e6fc9457b8..418c1884cca6b1a0fd1f6b2057dfabbd086a1fe9 100644 (file)
--- a/include/misc.h
+++ b/include/misc.h
@@ -125,6 +125,7 @@ extern int daemonize;
  * Usage: if (CANT_HAPPEN(...)) recovery_code();
  */
 #define CANT_HAPPEN(expr) ((expr) ? oops(#expr, __FILE__, __LINE__) : 0)
+extern int oops(char *, char *, int);
 
        /* return codes from command routines */
 #define        RET_OK          0       /* command completed sucessfully */

diff --git a/include/prototypes.h b/include/prototypes.h
index d6dcedc1784b199ff766e6815d889a4b2a0e5bd9..d27ca584872c21a0e6d7f766d9f0aedece6d47b1 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -307,7 +307,7 @@ extern int has_helpful_engineer(coord x, coord y, natid cn);
 /* log.c */
 extern void loginit(char *);
 extern void logerror(char *, ...) ATTRIBUTE((format (printf, 1, 2)));
-extern int oops(char *, char *, int);
+/* more in misc.h */
 /* maps.c */
 extern int draw_map(int, s_char, int, struct nstr_sect *);
 extern int unit_map(int, int, struct nstr_sect *, s_char *);