"strchr" -> "my_strchr".

[hengband/hengband.git] / src / z-config.h

diff --git a/src/z-config.h b/src/z-config.h
index 9bef197..2689941 100644 (file)
--- a/src/z-config.h
+++ b/src/z-config.h
@@ -22,8 +22,9 @@
  * USE_FONTSET and/or USE_XIM can be commented out
  * when you don't want to use it.
  */
-#ifdef JP
 #define USE_FONTSET
+
+#ifdef JP
 #define USE_XIM
 #endif
 
@@ -32,7 +33,7 @@
 #endif
 
 #if defined(JP) && !defined(USE_FONTSET)
-#define _JP
+#define USE_JP_FONTSTRUCT
 #endif
 
 #endif /* HAVE_CONFIG_H */
@@ -311,27 +312,6 @@
 
 #endif /* USE_SPECIAL */
 
-/*
- * OPTION: Hack -- Macintosh stuff
- */
-#ifdef MACINTOSH
-
-/* Do not handle signals */
-# undef HANDLE_SIGNALS
-
-#endif
-
-
-/*
- * OPTION: Hack -- Windows stuff
- */
-#ifdef WINDOWS
-
-/* Do not handle signals */
-# undef HANDLE_SIGNALS
-
-#endif
-
 
 /*
  * OPTION: Hack -- EMX stuff
@@ -513,6 +493,19 @@
 #define SUPPORT_GAMMA
 
 /*
+ * Hack -- Mach-O (native binary format of OS X) is basically a Un*x
+ * but has Mac OS/Windows-like user interface
+ */
+#ifdef MACH_O_CARBON
+# ifdef PRIVATE_USER_PATH
+#  undef PRIVATE_USER_PATH
+# endif
+# ifdef SAVEFILE_USE_UID
+#  undef SAVEFILE_USE_UID
+# endif
+#endif
+
+/*
  * Hack -- Special "ancient machine" versions
  */
 #if defined(USE_286) || defined(ANGBAND_LITE_MAC)
@@ -566,11 +559,6 @@
 /* Allow hordes of 'similar' monsters */
 # define MONSTER_HORDES
 
-/* Wizard mode testing options: */
-
-/* Testing upkeep */
-/* # define TRACK_FRIENDS */
-
 /*
  * OPTION: Repeat last command -- TNB
  */
@@ -605,21 +593,14 @@
  */
 #define SORT_R_INFO
 
-/*
- * Use a scripting language
- */
-/* #define USE_SCRIPT */
-
-#ifdef USE_SCRIPT
-/*
- * Python is statically linked into ZAngband
- */
-# define STATIC_PYTHON
-/* # define SCRIPT_OBJ_KIND */
-#endif /* USE_SCRIPT */
 
 #ifndef HAVE_CONFIG_H
+
 #ifndef MSDOS
+/*
+ * Use world score server
+ */
 #define WORLD_SCORE
 #endif
+
 #endif /* HAVE_CONFIG_H */