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

8 files changed, 21 insertions, 21 deletions

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 268b273c2..db82e0266 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -58,9 +58,9 @@
  * Machine-type definitions: PC Clone 386 running Microloss Windows
  */
 
-#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
@@ -75,9 +75,9 @@
 #endif
 
 
-#ifndef _MACINTOSH
+#ifndef macintosh
 #if defined(__MWERKS__) || defined(applec) || defined(THINK_C)
-#define _MACINTOSH
+#define macintosh
 #define SIZEOF_INT 4
 #define SIZEOF_SHORT 2
 #define HAVE_SRAND
@@ -1309,7 +1309,7 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_unpack_bytes
 		krb5_octet FAR * FAR *,
 		size_t FAR *));
 
-#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/include/krb5.hin b/src/include/krb5.hin
index 4150b0797..994952404 100644
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -27,15 +27,15 @@
 #ifndef KRB5_GENERAL__
 #define KRB5_GENERAL__
 
-#if defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH)
+#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
 #include <win-mac.h>
 /* Macintoh CFM-68K magic incantation */
-#if defined(_MACINTOSH) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
+#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
 #pragma import on
 #endif
 #endif
 
-#if defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH)
+#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
 #include <win-mac.h>
 #endif
 
@@ -2227,7 +2227,7 @@ KRB5_PROTOTYPE((krb5_context context,
 		char *in_tkt_service));
 
 /* Macintoh CFM-68K magic incantation */
-#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/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h
index d66e010c4..9134d9469 100644
--- a/src/include/krb5/adm_proto.h
+++ b/src/include/krb5/adm_proto.h
@@ -62,7 +62,7 @@ KRB5_DLLIMP void KRB5_CALLCONV krb5_adm_disconnect
 		   krb5_auth_context,
 		   krb5_ccache));
 
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH)
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
 /* adm_kw_dec.c */
 krb5_error_code krb5_adm_proto_to_dbent
 	KRB5_PROTOTYPE((krb5_context,
diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index 45a95c7ac..6a75372d1 100644
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -56,7 +56,7 @@
 #define KRB5_KDB_CREATE_BTREE		0x00000001
 #define KRB5_KDB_CREATE_HASH		0x00000002
 
-#if !defined(_MACINTOSH) && !defined(_MSDOS) && !defined(_WIN32)
+#if !defined(macintosh) && !defined(_MSDOS) && !defined(_WIN32)
 
 /*
  * Note --- these structures cannot be modified without changing the
@@ -448,5 +448,5 @@ krb5_error_code kdb5_db_set_dbops KRB5_PROTOTYPE((krb5_context,
 typedef	struct _kdb5_dispatch_table kdb5_dispatch_table;
 #endif	/* KDB5_DISPATCH */
 #endif /* notdef */
-#endif /* !defined(_MACINTOSH) && !defined(_MSDOS) &&!defined(_WIN32) */
+#endif /* !defined(macintosh) && !defined(_MSDOS) &&!defined(_WIN32) */
 #endif /* KRB5_KDB5__ */
diff --git a/src/include/krb5/kdb_dbc.h b/src/include/krb5/kdb_dbc.h
index 4fcb6af32..3dfd0d841 100644
--- a/src/include/krb5/kdb_dbc.h
+++ b/src/include/krb5/kdb_dbc.h
@@ -28,7 +28,7 @@
 #ifndef KRB5_KDB5_DBC__
 #define KRB5_KDB5_DBC__
 
-#if !defined(_MACINTOSH) && !defined(_MSDOS)
+#if !defined(macintosh) && !defined(_MSDOS)
 
 #include "kdb.h"
 	
@@ -56,5 +56,5 @@ krb5_error_code krb5_dbm_db_set_mkey
 krb5_error_code krb5_dbm_db_get_mkey
         KRB5_PROTOTYPE((krb5_context,krb5_db_context *,krb5_encrypt_block **));
 
-#endif /* !defined(_MACINTOSH) && !defined(_MSDOS) */
+#endif /* !defined(macintosh) && !defined(_MSDOS) */
 #endif /* KRB5_KDB5_DBM__ */
diff --git a/src/include/krb5/kdb_dbm.h b/src/include/krb5/kdb_dbm.h
index d1efffa57..cb652aadf 100644
--- a/src/include/krb5/kdb_dbm.h
+++ b/src/include/krb5/kdb_dbm.h
@@ -28,7 +28,7 @@
 #ifndef KRB5_KDB5_DBM__
 #define KRB5_KDB5_DBM__
 
-#if !defined(_MACINTOSH) && !defined(_MSDOS) && !defined(_WIN32)
+#if !defined(macintosh) && !defined(_MSDOS) && !defined(_WIN32)
 	
 /* exclusive or shared lock flags */
 #define	KRB5_DBM_SHARED		0
@@ -115,5 +115,5 @@ krb5_error_code krb5_dbm_db_open_database
 krb5_error_code krb5_dbm_db_close_database 
 	KRB5_PROTOTYPE((krb5_context));
 
-#endif /* !defined(_MACINTOSH) && !defined(_MSDOS) && !defined(WIN32) */
+#endif /* !defined(macintosh) && !defined(_MSDOS) && !defined(WIN32) */
 #endif /* KRB5_KDB5_DBM__ */
diff --git a/src/include/krb5/kdb_kt.h b/src/include/krb5/kdb_kt.h
index 08a269bf9..cdbda714f 100644
--- a/src/include/krb5/kdb_kt.h
+++ b/src/include/krb5/kdb_kt.h
@@ -28,12 +28,12 @@
 #ifndef KRB5_KDB5_KT_H
 #define KRB5_KDB5_KT_H
 
-#if !defined(_MACINTOSH) && !defined(_MSDOS)
+#if !defined(macintosh) && !defined(_MSDOS)
 
 #include "kdb.h"
 
 krb5_error_code krb5_ktkdb_resolve
         KRB5_PROTOTYPE((krb5_context, krb5_keytab *));
 
-#endif /* !defined(_MACINTOSH) && !defined(_MSDOS) */
+#endif /* !defined(macintosh) && !defined(_MSDOS) */
 #endif /* KRB5_KDB5_DBM__ */
diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index 588384d36..053a75edd 100644
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -216,7 +216,7 @@ HINSTANCE get_lib_instance(void);
 
 #endif /* _MSDOS || _WIN32 */
 
-#ifdef _MACINTOSH
+#ifdef macintosh
 
 #define KRB5_CALLCONV
 #define KRB5_CALLCONV_C
@@ -290,9 +290,9 @@ int fstat(int fildes, struct stat *buf);
 #define _MACSOCKAPI_
 
 #define THREEPARAMOPEN(x,y,z) open(x,y)
-#else /* _MACINTOSH */
+#else /* macintosh */
 #define THREEPARAMOPEN(x,y,z) open(x,y,z)
-#endif /* _MACINTOSH */
+#endif /* macintosh */
 
 #ifndef KRB5_CALLCONV
 #define KRB5_CALLCONV