From 7b8d15281d33c0699f851c3d39d6e5c8435cbede Mon Sep 17 00:00:00 2001 From: Miro Jurisic Date: Fri, 17 Jul 1998 20:39:56 +0000 Subject: [PATCH] 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 --- src/include/k5-int.h | 10 +++++----- src/include/krb5.hin | 8 ++++---- src/include/krb5/adm_proto.h | 2 +- src/include/krb5/kdb.h | 4 ++-- src/include/krb5/kdb_dbc.h | 4 ++-- src/include/krb5/kdb_dbm.h | 4 ++-- src/include/krb5/kdb_kt.h | 4 ++-- src/include/win-mac.h | 6 +++--- src/lib/crypto/os/c_ustime.c | 2 +- src/lib/gssapi/generic/gssapi.hin | 8 ++++---- src/lib/gssapi/generic/gssapiP_generic.h | 2 +- src/lib/gssapi/krb5/gssapiP_krb5.h | 2 +- src/lib/gssapi/krb5/gssapi_krb5.h | 2 +- src/lib/gssapi/krb5/pname_to_uid.c | 6 +++--- src/lib/gssapi/mechglue/g_initialize.c | 2 +- src/lib/gssapi/mechglue/oid_ops.c | 2 +- src/lib/krb5/asn.1/asn1_encode.c | 2 +- src/lib/krb5/ccache/file/fcc_retrv.c | 2 +- src/lib/krb5/ccache/stdio/scc_maybe.c | 4 ++-- src/lib/krb5/keytab/file/ser_ktf.c | 4 ++-- src/lib/krb5/krb/init_ctx.c | 4 ++-- src/lib/krb5/krb/parse.c | 2 +- src/lib/krb5/os/an_to_ln.c | 2 +- src/lib/krb5/os/ccdefname.c | 2 +- src/lib/krb5/os/init_os_ctx.c | 8 ++++---- src/lib/krb5/os/krbfileio.c | 2 +- src/lib/krb5/os/kuserok.c | 2 +- src/lib/krb5/os/prompter.c | 2 +- src/lib/krb5/os/promptusr.c | 2 +- src/lib/krb5/os/timeofday.c | 2 +- src/lib/krb5/posix/syslog.c | 2 +- src/lib/krb5/rcache/rc_io.c | 4 ++-- src/mac/gss/GSSSample.prefix.h | 1 - src/mac/libraries/KerberosHeaders.h | 2 +- src/util/et/com_err.c | 12 ++++++------ src/util/et/com_err.h | 12 ++++-------- src/util/et/error_message.c | 4 ++-- src/util/et/vfprintf.c | 2 +- src/util/profile/prof_int.h | 2 +- src/util/profile/prof_parse.c | 2 +- 40 files changed, 73 insertions(+), 78 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 /* 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 #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 diff --git a/src/lib/crypto/os/c_ustime.c b/src/lib/crypto/os/c_ustime.c index 350c1aa5c..e790acc95 100644 --- a/src/lib/crypto/os/c_ustime.c +++ b/src/lib/crypto/os/c_ustime.c @@ -27,7 +27,7 @@ #define NEED_SOCKETS #include "k5-int.h" -#ifdef _MACINTOSH +#ifdef macintosh /* We're a Macintosh -- do Mac time things. */ diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin index 13da452f9..d00e19ab9 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 /* 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 #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 20ba1baf2..a0fa7c4aa 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 #else #ifdef HAVE_STDLIB_H diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h index 9f3c75711..11b7c50f4 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 a1f51919d..63ac530f3 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 #else #include diff --git a/src/lib/gssapi/krb5/pname_to_uid.c b/src/lib/gssapi/krb5/pname_to_uid.c index 32fba4156..3bdad3f97 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 #endif #include #include #include -#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 c6cd71dd5..45310a7a9 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 a86764aca..c173240b7 100644 --- a/src/lib/gssapi/mechglue/oid_ops.c +++ b/src/lib/gssapi/mechglue/oid_ops.c @@ -33,7 +33,7 @@ #include #include #include -#ifndef _MACINTOSH +#ifndef macintosh #include #else #include diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c index aa8049e37..182de9b37 100644 --- a/src/lib/krb5/asn.1/asn1_encode.c +++ b/src/lib/krb5/asn.1/asn1_encode.c @@ -183,7 +183,7 @@ asn1_error_code asn1_encode_ia5string(buf, len, val, retlen) return 0; } -#ifdef _MACINTOSH +#ifdef macintosh #define EPOCH ((70 * 365 * 24 * 60 * 60) + (17 * 24 * 60 * 60) + (getTimeZoneOffset() * 60 * 60)) #else #define EPOCH (0) diff --git a/src/lib/krb5/ccache/file/fcc_retrv.c b/src/lib/krb5/ccache/file/fcc_retrv.c index e12d06e58..5f4e71d7c 100644 --- a/src/lib/krb5/ccache/file/fcc_retrv.c +++ b/src/lib/krb5/ccache/file/fcc_retrv.c @@ -26,7 +26,7 @@ #include "fcc.h" -#ifdef _MACINTOSH +#ifdef macintosh #define register #endif diff --git a/src/lib/krb5/ccache/stdio/scc_maybe.c b/src/lib/krb5/ccache/stdio/scc_maybe.c index 5b3544c34..7d6df3206 100644 --- a/src/lib/krb5/ccache/stdio/scc_maybe.c +++ b/src/lib/krb5/ccache/stdio/scc_maybe.c @@ -29,7 +29,7 @@ #include "scc.h" #include "k5-int.h" -#ifdef _MACINTOSH +#ifdef macintosh /* * Kludge for the Macintosh, since fopen doesn't set errno, but open * does... @@ -162,7 +162,7 @@ krb5_scc_open_file (context, id, mode) } #endif -#ifdef _MACINTOSH +#ifdef macintosh f = my_fopen (data->filename, open_flag); #else f = fopen (data->filename, open_flag); diff --git a/src/lib/krb5/keytab/file/ser_ktf.c b/src/lib/krb5/keytab/file/ser_ktf.c index 3be699b8b..61ad9176f 100644 --- a/src/lib/krb5/keytab/file/ser_ktf.c +++ b/src/lib/krb5/keytab/file/ser_ktf.c @@ -163,7 +163,7 @@ krb5_ktf_keytab_externalize(kcontext, arg, buffer, lenremain) int fflags = 0; file_is_open = 1; -#if !defined( _MACINTOSH) && !defined(_MSDOS) && !defined(_WIN32) +#if !defined( macintosh) && !defined(_MSDOS) && !defined(_WIN32) fflags = fcntl(fileno(ktdata->openf), F_GETFL, 0); if (fflags > 0) file_is_open |= ((fflags & O_ACCMODE) << 1); @@ -282,7 +282,7 @@ krb5_ktf_keytab_internalize(kcontext, argp, buffer, lenremain) int fmode; long fpos; -#if !defined( _MACINTOSH) && !defined(_MSDOS) && !defined(_WIN32) +#if !defined( macintosh) && !defined(_MSDOS) && !defined(_WIN32) fmode = (file_is_open >> 1) & O_ACCMODE; #else fmode = 0; diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index ed5d2fb3d..daa9fd95f 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -103,7 +103,7 @@ krb5_init_context(context) "kdc_default_options", 0, KDC_OPT_RENEWABLE_OK, &tmp); ctx->kdc_default_options = KDC_OPT_RENEWABLE_OK; -#ifdef _MACINTOSH +#ifdef macintosh #define DEFAULT_KDC_TIMESYNC 1 #else #define DEFAULT_KDC_TIMESYNC 0 @@ -121,7 +121,7 @@ krb5_init_context(context) * Note: DCE 1.0.3a only supports a cache type of 1 * DCE 1.1 supports a cache type of 2. */ -#ifdef _MACINTOSH +#ifdef macintosh #define DEFAULT_CCACHE_TYPE 4 #else #define DEFAULT_CCACHE_TYPE 3 diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c index 3b2305f19..2e6bc6bb0 100644 --- a/src/lib/krb5/krb/parse.c +++ b/src/lib/krb5/krb/parse.c @@ -185,7 +185,7 @@ krb5_parse_name(context, name, nprincipal) else krb5_princ_component(context, principal, i)->length = size; if (i + 1 != components) { -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH) +#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh) fprintf(stderr, "Programming error in krb5_parse_name!"); exit(1); diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c index 2df26a6c3..39103c8da 100644 --- a/src/lib/krb5/os/an_to_ln.c +++ b/src/lib/krb5/os/an_to_ln.c @@ -98,7 +98,7 @@ db_an_to_ln(context, dbname, aname, lnsize, lname) const int lnsize; char *lname; { -#if (!defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH)) +#if (!defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)) DBM *db; krb5_error_code retval; datum key, contents; diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c index 585dd54ea..d3914bcdc 100644 --- a/src/lib/krb5/os/ccdefname.c +++ b/src/lib/krb5/os/ccdefname.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include -#ifdef _MACINTOSH +#ifdef macintosh static CInfoPBRec theCatInfo; static char *FileBuffer; static int indexCount; diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index 2a637d51a..99d9e6daf 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -26,7 +26,7 @@ #define NEED_WINDOWS #include "k5-int.h" -#ifdef _MACINTOSH +#ifdef macintosh static CInfoPBRec theCatInfo; static char *FileBuffer; static int indexCount; @@ -106,7 +106,7 @@ os_init_paths(ctx, secure) krb5_error_code retval = 0; char *name = 0; -#if defined(_MACINTOSH) || defined(_MSDOS) || defined(_WIN32) +#if defined(macintosh) || defined(_MSDOS) || defined(_WIN32) const char *filenames[2]; #endif @@ -131,7 +131,7 @@ os_init_paths(ctx, secure) retval = profile_init(filenames, &ctx->profile); #else /* _MSDOS || _WIN32 */ -#ifdef _MACINTOSH +#ifdef macintosh filenames[0] = GetMacProfilePathName(); filenames[1] = 0; retval = profile_init(filenames, &ctx->profile); @@ -144,7 +144,7 @@ os_init_paths(ctx, secure) if(!name) name = DEFAULT_PROFILE_PATH; retval = profile_init_path(name, &ctx->profile); -#endif /* _MACINTOSH */ +#endif /* macintosh */ #endif /* _MSDOS || _WIN32 */ if (retval) diff --git a/src/lib/krb5/os/krbfileio.c b/src/lib/krb5/os/krbfileio.c index 0273f024a..3875b8b19 100644 --- a/src/lib/krb5/os/krbfileio.c +++ b/src/lib/krb5/os/krbfileio.c @@ -94,7 +94,7 @@ krb5_sync_disk_file(context, fp) FILE *fp; { fflush(fp); -#if !defined(MSDOS_FILESYSTEM) && !defined(_MACINTOSH) +#if !defined(MSDOS_FILESYSTEM) && !defined(macintosh) if (fsync(fileno(fp))) { return errno; } diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c index 3e54fa0c1..6d3032e8e 100644 --- a/src/lib/krb5/os/kuserok.c +++ b/src/lib/krb5/os/kuserok.c @@ -25,7 +25,7 @@ */ #include "k5-int.h" -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH) /* Not yet for Windows */ +#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh) /* Not yet for Windows */ #include #include diff --git a/src/lib/krb5/os/prompter.c b/src/lib/krb5/os/prompter.c index 10f9d541b..eea503740 100644 --- a/src/lib/krb5/os/prompter.c +++ b/src/lib/krb5/os/prompter.c @@ -1,5 +1,5 @@ #include "k5-int.h" -#if !defined(_MSDOS) && (!defined(_WIN32) || (defined(_WIN32) && defined(__CYGWIN32__))) && !defined(_MACINTOSH) +#if !defined(_MSDOS) && (!defined(_WIN32) || (defined(_WIN32) && defined(__CYGWIN32__))) && !defined(macintosh) #include #include #include diff --git a/src/lib/krb5/os/promptusr.c b/src/lib/krb5/os/promptusr.c index f40be0ff4..55b726d71 100644 --- a/src/lib/krb5/os/promptusr.c +++ b/src/lib/krb5/os/promptusr.c @@ -3,7 +3,7 @@ */ #include "k5-int.h" -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH) +#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh) #include #include diff --git a/src/lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c index 42fc42fcc..047eed82b 100644 --- a/src/lib/krb5/os/timeofday.c +++ b/src/lib/krb5/os/timeofday.c @@ -45,7 +45,7 @@ krb5_timeofday(context, timeret) *timeret = os_ctx->time_offset; return 0; } -#ifdef _MACINTOSH +#ifdef macintosh { long usecs; krb5_error_code kret; diff --git a/src/lib/krb5/posix/syslog.c b/src/lib/krb5/posix/syslog.c index b853f046d..31e787493 100644 --- a/src/lib/krb5/posix/syslog.c +++ b/src/lib/krb5/posix/syslog.c @@ -33,7 +33,7 @@ * Modified to use UNIX domain IPC by Ralph Campbell */ -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH) +#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh) #if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32) #include diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c index e05d42ab9..ae5c6d061 100644 --- a/src/lib/krb5/rcache/rc_io.c +++ b/src/lib/krb5/rcache/rc_io.c @@ -252,7 +252,7 @@ krb5_error_code krb5_rc_io_move (context, new, old) if (new->fn == 0) return ENOMEM; strcpy(new->fn, old->fn); -#ifdef _MACINTOSH +#ifdef macintosh new->fd = fcntl(old->fd, F_DUPFD); #else new->fd = dup(old->fd); @@ -285,7 +285,7 @@ krb5_error_code krb5_rc_io_sync (context, d) krb5_context context; krb5_rc_iostuff *d; { -#if !defined(MSDOS_FILESYSTEM) && !defined(_MACINTOSH) +#if !defined(MSDOS_FILESYSTEM) && !defined(macintosh) if (fsync(d->fd) == -1) { switch(errno) { diff --git a/src/mac/gss/GSSSample.prefix.h b/src/mac/gss/GSSSample.prefix.h index 84a0c9615..be0efb227 100644 --- a/src/mac/gss/GSSSample.prefix.h +++ b/src/mac/gss/GSSSample.prefix.h @@ -1,5 +1,4 @@ #define GSSAPI_V2 -#define _MACINTOSH //#include diff --git a/src/mac/libraries/KerberosHeaders.h b/src/mac/libraries/KerberosHeaders.h index 9269de942..bfc768ce8 100644 --- a/src/mac/libraries/KerberosHeaders.h +++ b/src/mac/libraries/KerberosHeaders.h @@ -11,7 +11,7 @@ */ #define KRB5 1 -#define _MACINTOSH +#define macintosh #define SIZEOF_INT 4 #define SIZEOF_SHORT 2 #define ENOMEM -1 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 #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 -#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 -#if !defined(_MACINTOSH) +#if !defined(macintosh) #if defined(HAVE_STDARG_H) || defined(_MSDOS) || defined(_WIN32) #include #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 -- 2.26.2