From: Alexandra Ellwood <lxs@mit.edu>
Date: Fri, 9 Jun 2006 21:56:15 +0000 (+0000)
Subject: Removed ancient Metrowerks tests from public headers
X-Git-Tag: krb5-1.6-alpha1~274^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5432daabf38c08ca2d61dbc6aaefc5f1a3586ee3;p=krb5.git

Removed ancient Metrowerks tests from public headers

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/ccapi@18097 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/ccapi/include/CredentialsCache.h b/src/lib/ccapi/include/CredentialsCache.h
index 12748bb9d..45b9ac4c4 100644
--- a/src/lib/ccapi/include/CredentialsCache.h
+++ b/src/lib/ccapi/include/CredentialsCache.h
@@ -59,14 +59,7 @@
 #define __CREDENTIALSCACHE__
 
 #if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))
-	#include <TargetConditionals.h>
-    #if TARGET_RT_MAC_CFM
-        #error "Use KfM 4.0 SDK headers for CFM compilation."
-    #endif
-#endif
-
-#if TARGET_OS_MAC
-    #include <sys/types.h>
+#include <TargetConditionals.h>
 #endif
 
 #if defined(_WIN32)
@@ -78,13 +71,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 #if TARGET_OS_MAC
-    #if defined(__MWERKS__)
-        #pragma import on
-        #pragma enumsalwaysint on
-    #endif
-    #pragma options align=mac68k
+#pragma options align=mac68k
 #endif
-
+    
 #if defined(_WIN32)
 #define CCACHE_API 	__declspec(dllexport)
 
@@ -94,6 +83,8 @@ extern "C" {
 #endif /* _TIME_T_DEFINED */
 #define _USE_32BIT_TIME_T
 #endif 
+#else
+#define CCACHE_API
 #endif
 
 #include <time.h>
@@ -591,11 +582,7 @@ CCACHE_API cc_int32 cc_initialize (
 			((iterator) -> functions -> clone (iterator, new_iter))
 			
 #if TARGET_OS_MAC
-    #if defined(__MWERKS__)
-        #pragma enumsalwaysint reset
-        #pragma import reset
-    #endif
-	#pragma options align=reset
+#pragma options align=reset
 #endif
 
 #ifdef __cplusplus
diff --git a/src/lib/ccapi/include/CredentialsCache2.h b/src/lib/ccapi/include/CredentialsCache2.h
index 706c86913..5505bf29f 100644
--- a/src/lib/ccapi/include/CredentialsCache2.h
+++ b/src/lib/ccapi/include/CredentialsCache2.h
@@ -49,11 +49,9 @@
 #define __CREDENTIALSCACHE2__
  
 #include "CredentialsCache.h"
+
 #if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))
-	#include <TargetConditionals.h>
-    #if TARGET_RT_MAC_CFM
-        #error "Use KfM 4.0 SDK headers for CFM compilation."
-    #endif
+#include <TargetConditionals.h>
 #endif
 
 #ifdef __cplusplus
@@ -61,13 +59,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 #if TARGET_OS_MAC
-    #if defined(__MWERKS__)
-        #pragma import on
-        #pragma enumsalwaysint on
-    #endif
-    #pragma options align=mac68k
+#pragma options align=mac68k
 #endif
-
+    
 /* Some old types get directly mapped to new types */
 
 typedef cc_context_d apiCB;
@@ -306,11 +300,7 @@ CCACHE_API cc_int32 cc_lock_request(
         const cc_int32 			lock_type);
 
 #if TARGET_OS_MAC
-    #if defined(__MWERKS__)
-        #pragma enumsalwaysint reset
-        #pragma import reset
-    #endif
-	#pragma options align=reset
+#pragma options align=reset
 #endif
 
 #ifdef __cplusplus