[Refactor] #37353 MAC_MPWのプリプロを削除 (CARBON と MACH_O_CARBONは保留) / Removed preprocessor...

diff --git a/src/h-config.h b/src/h-config.h
index 0f5d2af..50d9d68 100644 (file)
--- a/src/h-config.h
+++ b/src/h-config.h
@@ -32,15 +32,6 @@
 #endif
 
 /*
- * Extract the "MAC_MPW" flag from the compiler
- */
-#if defined(__SC__) || defined(__MRC__)
-# ifndef MAC_MPW
-#  define MAC_MPW
-# endif
-#endif
-
-/*
  * OPTION: Compile on a HPUX version of UNIX
  */
 #ifndef HPUX
@@ -593,9 +584,7 @@
  * Check the modification time of *_info.raw files
  * (by Keldon Jones)
  */
-#ifndef MAC_MPW
 #define CHECK_MODIFICATION_TIME
-#endif
 
 /*
  * Use the new sorting routines for creation

diff --git a/src/util.c b/src/util.c
index 235a107..9677350 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -339,13 +339,6 @@ errr path_parse(char *buf, int max, concptr file)
 {
        /* Accept the filename */
        (void)strnfmt(buf, max, "%s", file);
-
-#if defined(MAC_MPW) && defined(CARBON)
-       /* Fix it according to the current operating system */
-       convert_pathname(buf);
-#endif /* MAC_MPW && CARBON */
-
-       /* Success */
        return 0;
 }
 
@@ -442,14 +435,14 @@ FILE *my_fopen(concptr file, concptr mode)
 {
        char buf[1024];
 
-#if defined(MAC_MPW) || defined(MACH_O_CARBON)
+#if defined(MACH_O_CARBON)
        FILE *tempfff;
 #endif
 
        /* Hack -- Try to parse the path */
        if (path_parse(buf, 1024, file)) return (NULL);
 
-#if defined(MAC_MPW) || defined(MACH_O_CARBON)
+#if defined(MACH_O_CARBON)
        if (my_strchr(mode, 'w'))
        {
                /* setting file type/creator */
@@ -733,7 +726,7 @@ int fd_make(concptr file, BIT_FLAGS mode)
        /* Hack -- Try to parse the path */
        if (path_parse(buf, 1024, file)) return -1;
 
-#if defined(MAC_MPW) || defined(MACH_O_CARBON)
+#if defined(MACH_O_CARBON)
        {
                int fdes;
                /* Create the file, fail if exists, write-only, binary */

diff --git a/src/util.h b/src/util.h
index 81da40f..96224ca 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -310,15 +310,11 @@ extern void user_name(char *buf, int id);
 extern int usleep(huge usecs);
 #endif
 
-#if defined(MAC_MPW) && defined(CARBON)
-extern void convert_pathname(char *path);
-#endif
-
 #if defined(MACH_O_CARBON)
 extern void fsetfileinfo(concptr path, u32b fcreator, u32b ftype);
 #endif
 
-#if defined(MAC_MPW) || defined(MACH_O_CARBON)
+#if defined(MACH_O_CARBON)
 /* Globals needed */
 extern  u32b _ftype;
 extern  u32b _fcreator;