Merge branch 'develop' into macos-develop

[hengbandforosx/hengbandosx.git] / src / system / h-config.h

diff --git a/src/system/h-config.h b/src/system/h-config.h
index 151fbc2..b6e9aaa 100644 (file)
--- a/src/system/h-config.h
+++ b/src/system/h-config.h
@@ -88,6 +88,21 @@ constexpr auto MAINTAINER = "echizen@users.sourceforge.jp";
   #define DEFAULT_X11_FONT_6 DEFAULT_X11_FONT_SUB
   #define DEFAULT_X11_FONT_7 DEFAULT_X11_FONT_SUB
   
+  /*
+   * Hack -- Mach-O (native binary format of OS X) is basically a Un*x
+   * but has Mac OS/Windows-like user interface.  Disabling the Un*x-like
+   * behavior (PRIVATE_USER_PATH, SAVEFILE_USE_UID) for the modern Mac OS X
+   * interface (MACH_O_COCOA).
+   */
+  #if defined(MACH_O_CARBON) || defined(MACH_O_COCOA)
+  #ifdef PRIVATE_USER_PATH
+  #undef PRIVATE_USER_PATH
+  #endif
+  #ifdef SAVEFILE_USE_UID
+  #undef SAVEFILE_USE_UID
+  #endif
+  #endif
+
   #ifdef JP
     #ifdef EUC
       #define iskanji(x) (iseuckanji(x))