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

7 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 13da452..d00e19a 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -27,11 +27,11 @@
  * Determine platform-dependent configuration.
  */
 
-#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
@@ -72,7 +72,7 @@
 /*
  * POSIX says that sys/types.h is where size_t is defined.
  */
-#ifndef _MACINTOSH
+#ifndef macintosh
 #include <sys/types.h>
 #endif
 
@@ -704,7 +704,7 @@ PROTOTYPE(	(OM_uint32  *,		/* minor_status */
 #define GSS_S_CRED_UNAVAIL GSS_S_FAILURE
 
 /* 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/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 20ba1ba..a0fa7c4 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -27,7 +27,7 @@
  * $Id$
  */
 
-#if (defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH))
+#if (defined(_MSDOS) || defined(_WIN32) || defined(macintosh))
 #include <k5-int.h>
 #else
 #ifdef HAVE_STDLIB_H
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 9f3c757..11b7c50 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -38,7 +38,7 @@
 #undef minor
 #endif
 
-#ifndef _MACINTOSH
+#ifndef macintosh
 #include "../generic/gssapiP_generic.h"
 #else
 #include "gssapiP_generic.h"
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index a1f5191..63ac530 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -23,7 +23,7 @@
 #ifndef _GSSAPI_KRB5_H_
 #define _GSSAPI_KRB5_H_
 
-#ifndef _MACINTOSH
+#ifndef macintosh
 #include <gssapi/gssapi_generic.h>
 #else
 #include <gssapi_generic.h>
diff --git a/src/lib/gssapi/krb5/pname_to_uid.c b/src/lib/gssapi/krb5/pname_to_uid.c
index 32fba41..3bdad3f 100644
--- a/src/lib/gssapi/krb5/pname_to_uid.c
+++ b/src/lib/gssapi/krb5/pname_to_uid.c
@@ -25,14 +25,14 @@
  */
 
 #include "gssapiP_krb5.h"
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH)
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #include <string.h>
 #include <pwd.h>
 #include <sys/types.h>
-#endif	/* !_MSDOS && !_MACINTOSH */
+#endif	/* !_MSDOS && !macintosh */
 
 /* 
  * This function will probably get replaced with the gsscred stuff...
@@ -46,7 +46,7 @@ gss_OID name_type;
 gss_OID mech_type;
 uid_t * uid;
 {
-#if defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH)
+#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
 	return (0);		/* failure */
 #else
 
diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index c6cd71d..45310a7 100644
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -157,7 +157,7 @@ void gss_initialize ()
 
 #endif /* USE_SOLARIS_SHARED_LIBRARIES */
 
-#if !defined(_MSDOS) && !defined(_MACINTOSH)
+#if !defined(_MSDOS) && !defined(macintosh)
     if (__gss_mechs_array == NULL) { /* this is very bad! */
       fprintf(stderr,"gss_initialize fatal error: no mechanisms loaded!\n");
       exit(-1);
diff --git a/src/lib/gssapi/mechglue/oid_ops.c b/src/lib/gssapi/mechglue/oid_ops.c
index a86764a..c173240 100644
--- a/src/lib/gssapi/mechglue/oid_ops.c
+++ b/src/lib/gssapi/mechglue/oid_ops.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#ifndef _MACINTOSH
+#ifndef macintosh
 #include <gssapi/gssapi_generic.h>
 #else
 #include <gssapi_generic.h>