Replaced preprocessor symbol _MACINTOSH with macintosh, since macintosh is the standard symbol defined by all Mac compiler (oh, sure, it doesn't have _. but at least it's always there)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10653 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 15 insertions, 19 deletions

diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c
index 7ae2a23c7..091968923 100644
--- a/src/util/et/com_err.c
+++ b/src/util/et/com_err.c
@@ -25,7 +25,7 @@
 #if defined(_MSDOS) || defined(_WIN32)
 #include <io.h>
 #endif
-#ifdef _MACINTOSH
+#ifdef macintosh
 #include "icons.h"
 static void MacMessageBox(char *errbuf);
 #endif
@@ -42,7 +42,7 @@ static void default_com_err_proc(whoami, code, fmt, ap)
 	const char FAR *fmt;
 	va_list ap;
 {
-#if defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH)
+#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
 
 	char errbuf[1024] = "";
 
@@ -57,7 +57,7 @@ static void default_com_err_proc(whoami, code, fmt, ap)
 	if (fmt)
 		vsprintf (errbuf + strlen (errbuf), fmt, ap);
 
-#ifdef _MACINTOSH
+#ifdef macintosh
 	MacMessageBox(errbuf);
 #else
 #ifdef _WIN32
@@ -69,9 +69,9 @@ static void default_com_err_proc(whoami, code, fmt, ap)
 	} else
 #endif /* _WIN32 */
 	    MessageBox ((HWND)NULL, errbuf, "Kerberos", MB_ICONEXCLAMATION);
-#endif /* _MACINTOSH */
+#endif /* macintosh */
 
-#else /* !_MSDOS && !_WIN32 && !_MACINTOSH */
+#else /* !_MSDOS && !_WIN32 && !macintosh */
     
 	if (whoami) {
 		fputs(whoami, stderr);
@@ -147,7 +147,7 @@ et_old_error_hook_func reset_com_err_hook ()
 }
 #endif
 
-#ifdef _MACINTOSH
+#ifdef macintosh
 static void MacMessageBox(errbuf)
 	char *errbuf;
 {
diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index 636e57cdd..50f941326 100644
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -20,13 +20,9 @@
 #define unix
 #endif
 
-#if defined(__MWERKS__) || defined(applec) || defined(THINK_C)
-#define _MACINTOSH
-#endif
-
-#if defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH)
+#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
 #include <win-mac.h>
-#if defined(_MACINTOSH) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
+#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
 #pragma import on
 #endif
 #endif
@@ -43,7 +39,7 @@
 #define NEAR
 #endif
 
-#if defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH)
+#if defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
 
 /* End-user programs may need this -- oh well */
 #ifndef HAVE_STDARG_H
@@ -108,7 +104,7 @@ extern et_old_error_hook_func reset_com_err_hook
 }
 #endif
 
-#if defined(_MACINTOSH) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
+#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
 #pragma import reset
 #endif
 
diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c
index 691df289e..d18b36867 100644
--- a/src/util/et/error_message.c
+++ b/src/util/et/error_message.c
@@ -28,13 +28,13 @@
 #define HAVE_STRERROR
 #endif
 
-#ifdef _MACINTOSH
+#ifdef macintosh
 #define sys_nerr 100
 #endif
 
 #if !defined(HAVE_STRERROR) && !defined(SYS_ERRLIST_DECLARED)
 extern char const * const sys_errlist[];
-#ifndef _MACINTOSH
+#ifndef macintosh
 extern const int sys_nerr;
 #endif
 #endif
diff --git a/src/util/et/vfprintf.c b/src/util/et/vfprintf.c
index 48b3a40c0..567d40225 100644
--- a/src/util/et/vfprintf.c
+++ b/src/util/et/vfprintf.c
@@ -18,7 +18,7 @@
 /* based on @(#)vfprintf.c	5.2 (Berkeley) 6/27/88 */
 
 #include <stdio.h>
-#if !defined(_MACINTOSH)
+#if !defined(macintosh)
 #if defined(HAVE_STDARG_H) || defined(_MSDOS) || defined(_WIN32)
 #include <stdarg.h>
 #else
diff --git a/src/util/profile/prof_int.h b/src/util/profile/prof_int.h
index 228c77bad..2096bd66d 100644
--- a/src/util/profile/prof_int.h
+++ b/src/util/profile/prof_int.h
@@ -25,7 +25,7 @@
 #define SIZEOF_LONG     4
 #endif
 
-#if defined(_MACINTOSH)
+#if defined(macintosh)
 #define NO_SYS_TYPES_H
 #define NO_SYS_STAT_H
 #endif
diff --git a/src/util/profile/prof_parse.c b/src/util/profile/prof_parse.c
index e7e72b8cd..5d92d9706 100644
--- a/src/util/profile/prof_parse.c
+++ b/src/util/profile/prof_parse.c
@@ -295,7 +295,7 @@ static void output_quoted_string(str, f)
 #define EOL "\r\n"
 #endif
 
-#ifdef _MACINTOSH
+#ifdef macintosh
 #define EOL "\r"
 #endif