change NetHack's MACOSX references to MACOS

diff --git a/include/config1.h b/include/config1.h
index e93b98d22cd87ce415b3a942c516090d48e247e2..e79da0ecb02ed2c96dd86a071e38030ec845ec66 100644 (file)
--- a/include/config1.h
+++ b/include/config1.h
@@ -37,7 +37,7 @@
  * Mac Stuff.
  */
 #if defined(__APPLE__) && defined(__MACH__)
-#define MACOSX
+#define MACOS
 #endif
 
 #ifdef macintosh /* Auto-defined symbol for MPW compilers (sc and mrc) */

diff --git a/include/global.h b/include/global.h
index ec6b71167d0ddbed5b6c6d7380d8e86cd0964694..b3436de94a1066de08547bb1f28b43bd5d5db843 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -424,7 +424,7 @@ struct savefile_info {
 #if defined(__linux__) && defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define PANICTRACE_LIBC
 #endif
-#if defined(MACOSX)
+#if defined(MACOS)
 #define PANICTRACE_LIBC
 #endif
 #ifdef UNIX

diff --git a/include/system.h b/include/system.h
index d03f8ac914936de303deae3f928528de55f7eb39..9f1ebbe6943db8a1736e734942c21583f5e26861 100644 (file)
--- a/include/system.h
+++ b/include/system.h
@@ -91,13 +91,13 @@ E int srandom(unsigned int);
 #endif
 #endif
 #else
-#if defined(MACOSX)
+#if defined(MACOS)
 E long lrand48(void);
 E void srand48(long);
 #else
 extern long lrand48(void);
 extern void srand48(long);
-#endif /* MACOSX */
+#endif /* MACOS */
 #endif /* BSD || ULTRIX || RANDOM */
 
 #if !defined(BSD) || defined(ultrix)

diff --git a/include/unixconf.h b/include/unixconf.h
index 698adfc56394c642098e4173fef8c1f4be16ec5b..303139e99909a86b36ab9143aeb2ae28c54359c0 100644 (file)
--- a/include/unixconf.h
+++ b/include/unixconf.h
@@ -117,7 +117,7 @@
  */
 /* #define TIMED_DELAY */ /* usleep() */
 #endif
-#if defined(MACOSX) && !defined(TIMED_DELAY)
+#if defined(MACOS) && !defined(TIMED_DELAY)
 #define TIMED_DELAY
 #endif
 
@@ -335,7 +335,7 @@
 /* the high quality random number routines */
 #ifndef USE_ISAAC64
 # if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) \
-    || defined(RANDOM) || defined(MACOSX)
+    || defined(RANDOM) || defined(MACOS)
 #  define Rand() random()
 # else
 #  define Rand() lrand48()
@@ -392,7 +392,7 @@
 #endif /* LINUX */
 #endif /* GNOME_GRAPHICS */
 
-#if defined(MACOSX) && !defined(LIBNH)
+#if defined(MACOS) && !defined(LIBNH)
 # define RUNTIME_PASTEBUF_SUPPORT
 #endif
 
@@ -405,7 +405,7 @@
 #ifdef LINUX
 # define DEV_RANDOM "/dev/urandom"
 #else
-# if defined(BSD) || defined(MACOSX)
+# if defined(BSD) || defined(MACOS)
 #  define DEV_RANDOM "/dev/random"
 # endif
 #endif

diff --git a/src/eat.c b/src/eat.c
index c132863c689bc0bab00f0a0906cc1d2b7fc60556..43b76c3e3d123f569163ca8f2281f533a0907cde 100644 (file)
--- a/src/eat.c
+++ b/src/eat.c
@@ -1871,9 +1871,9 @@ fprefx(struct obj *otmp)
         } else if (otmp->otyp == APPLE && otmp->cursed && !Sleep_resistance) {
             ; /* skip core joke; feedback deferred til fpostfx() */
 
-#if defined(MAC) || defined(MACOSX)
+#if defined(MAC) || defined(MACOS)
         /* KMH -- Why should Unix have all the fun?
-           We check MACOSX before UNIX to get the Apple-specific apple
+           We check MACOS before UNIX to get the Apple-specific apple
            message; the '#if UNIX' code will still kick in for pear. */
         } else if (otmp->otyp == APPLE) {
             pline("Delicious!  Must be a Macintosh!");

diff --git a/win/Qt/qt_bind.cpp b/win/Qt/qt_bind.cpp
index 9a525d9883e0ea6950b9173195437f6d26b40a89..f5ed6eb0799edbdb4607e4fd8c5cebc1960f7971 100644 (file)
--- a/win/Qt/qt_bind.cpp
+++ b/win/Qt/qt_bind.cpp
@@ -122,7 +122,7 @@ NetHackQtBind::NetHackQtBind(int& argc, char** argv) :
         QString qvers = version_string(cvers);
         QCoreApplication::setApplicationVersion(qvers);
     }
-#ifdef MACOSX
+#ifdef MACOS
     /* without this, neither control+x nor option+x do anything;
        with it, control+x is ^X and option+x still does nothing */
     QCoreApplication::setAttribute(Qt::AA_MacDontSwapCtrlAndMeta);

diff --git a/win/Qt/qt_main.cpp b/win/Qt/qt_main.cpp
index 69126e36e6764c5eae59db496baa54729b494975..d0fbd003617cdd3268cc9386dfb8a822ec8f2f58 100644 (file)
--- a/win/Qt/qt_main.cpp
+++ b/win/Qt/qt_main.cpp
@@ -534,10 +534,10 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
     setWindowTitle("NetHack-Qt");
     setWindowIcon(QIcon(QPixmap(qt_compact_mode ? nh_icon_small : nh_icon)));
 
-#ifdef MACOSX
+#ifdef MACOS
     /*
-     * OSX Note:
-     *  The toolbar on OSX starts with a system menu labeled with the
+     * MacOS Note:
+     *  The toolbar on MacOS starts with a system menu labeled with the
      *  Apple logo and an application menu labeled with the application's
      *  name (taken from Info.plist if present, otherwise the base name
      *  of the running program).  After that, application-specific menus
@@ -585,7 +585,7 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
         { game,    "History",            3, dohistory},
         { game,    "Redraw",             0, doredraw}, // useless
         { game,
-#ifdef MACOSX
+#ifdef MACOS
             /* Qt on OSX would rename "Options" to "Preferences..." and
                move it from intended destination to the application menu;
                the ampersand produces &O which makes Alt+O into a keyboard
@@ -597,7 +597,7 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
         { game,    0, 3},
         { game,    "Save-and-exit",      3, dosave},
         { game,
-#ifdef MACOSX
+#ifdef MACOS
             /* need something to prevent matching leading "quit" so that it
                isn't hijacked for the application menu; the ampersand is to
                make &Q be a keyboard shortcut (but see Options above) */
@@ -687,7 +687,7 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
     };
 
     QAction *actn;
-#ifndef MACOSX
+#ifndef MACOS
     (void) game->addAction("Qt settings...", this, SLOT(doQtSettings(bool)));
 #else
     /* on OSX, put this in the application menu instead of the game menu;
@@ -707,7 +707,7 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
 #endif
 
     actn = help->addAction("About NetHack-Qt", this, SLOT(doAbout(bool)));
-#ifdef MACOSX
+#ifdef MACOS
     actn->setMenuRole(QWidgetAction::AboutRole);
     /* for OSX, the preceding "About" went into the application menu;
        now add another duplicate one to the Help dropdown menu */
@@ -793,7 +793,7 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
        info->setTitle("Info");
        menubar->addMenu(info);
        menubar->addSeparator();
-#ifndef MACOSX
+#ifndef MACOS
        help->setTitle("Help");
 #else
         // On OSX, an entry in the menubar called "Help" will get an
@@ -1021,7 +1021,7 @@ void NetHackQtMainWindow::doQuit(bool)
     // either one, other implementations only have that other one (plus
     // nethack's #quit command itself) but this routine is unconditional
     // in case someone wants to change that
-#ifdef MACOSX
+#ifdef MACOS
     QString info;
     info.sprintf("This will end your NetHack session.%s",
                  !g.program_state.something_worth_saving ? ""

diff --git a/win/Qt/qt_main.h b/win/Qt/qt_main.h
index 54b56c4531aabfa9ea1027487bc19579dcd4804a..e2eaacad41bd9380012149938fe455bb2526a7cd 100644 (file)
--- a/win/Qt/qt_main.h
+++ b/win/Qt/qt_main.h
@@ -20,7 +20,7 @@
 #define DYNAMIC_STATUSLINES
 
 // NetHackQtBind::notify() doesn't see ^V on OSX
-#ifdef MACOSX
+#ifdef MACOS
 #define CTRL_V_HACK
 #endif
 

diff --git a/win/X11/winX.c b/win/X11/winX.c
index 804ef2ba89b8432361b8b6d9e6cb6806277cf9df..66a0ac184e6a733be6e95c5c5ad337ae78a503eb 100644 (file)
--- a/win/X11/winX.c
+++ b/win/X11/winX.c
@@ -578,7 +578,7 @@ get_window_frame_extents(Widget w,
         /*
          * FIXME!
          */
-#ifdef MACOSX
+#ifdef MACOS
         /*
          * Default window manager doesn't support _NET_FRAME_EXTENTS.
          * Without this position tweak, the persistent inventory window