From: nhmall <nhmall@nethack.org>
Date: Wed, 1 Feb 2023 19:04:20 +0000 (-0500)
Subject: undefine X11_BUILD after hack.h or config.h
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3214335bb58b67fabb6c6e806a264464215e6f9a;p=nethack

undefine X11_BUILD after hack.h or config.h

So as not to complicate any onefile efforts by leaving it defined.
---

diff --git a/win/X11/dialogs.c b/win/X11/dialogs.c
index 03f430c6b..37d81313b 100644
--- a/win/X11/dialogs.c
+++ b/win/X11/dialogs.c
@@ -80,6 +80,7 @@
 #define X11_BUILD
 #include "config.h" /* #define for const for non __STDC__ compilers */
 #undef X11_BUILD
+
 #include "lint.h"   /* for nethack's nhStr() macro */
 #include "winX.h"   /* to make sure protoypes match corresponding functions */
 
diff --git a/win/X11/winX.c b/win/X11/winX.c
index b59574540..05d7c2ef9 100644
--- a/win/X11/winX.c
+++ b/win/X11/winX.c
@@ -16,8 +16,6 @@
 #define SHORT_FILENAMES
 #endif
 
-#define X11_BUILD
-
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
@@ -48,7 +46,10 @@
 #undef SHORT_FILENAMES /* hack.h will reset via global.h if necessary */
 #endif
 
+#define X11_BUILD
 #include "hack.h"
+#undef X11_BUILD
+
 #include "winX.h"
 #include "dlb.h"
 #include "xwindow.h"
diff --git a/win/X11/winmenu.c b/win/X11/winmenu.c
index ba9258fdd..550b81fe6 100644
--- a/win/X11/winmenu.c
+++ b/win/X11/winmenu.c
@@ -34,8 +34,9 @@
 #endif
 
 #define X11_BUILD
-
 #include "hack.h"
+#undef X11_BUILD
+
 #include "winX.h"
 
 static void menu_size_change_handler(Widget, XtPointer, XEvent *,
diff --git a/win/X11/winmisc.c b/win/X11/winmisc.c
index 8c193e43a..f4d0b28af 100644
--- a/win/X11/winmisc.c
+++ b/win/X11/winmisc.c
@@ -35,8 +35,9 @@
 #endif
 
 #define X11_BUILD
-
 #include "hack.h"
+#undef X11_BUILD
+
 #include "func_tab.h"
 #include "winX.h"
 
diff --git a/win/X11/wintext.c b/win/X11/wintext.c
index 724222ebc..291ed81f3 100644
--- a/win/X11/wintext.c
+++ b/win/X11/wintext.c
@@ -29,8 +29,9 @@
 #endif
 
 #define X11_BUILD
-
 #include "hack.h"
+#undef X11_BUILD
+
 #include "winX.h"
 #include "xwindow.h"