From 02c259aa1ae59c48ab0ae6cbb7168d6e26ca22a4 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Thu, 1 Nov 2007 08:08:32 +0000
Subject: Conditionalize "#pragma mark" on TARGET_OS_MAC. Don't use "#pragma
 warning" when not on Windows.  (In fact, the just-added uses shouldn't be
 needed if the above conditional is done right, so one of them was deleted.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20161 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/ccapi/common/cci_array_internal.c | 6 +++++-
 src/ccapi/common/cci_common.h         | 4 +---
 src/ccapi/common/cci_identifier.c     | 6 +++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/ccapi/common')

diff --git a/src/ccapi/common/cci_array_internal.c b/src/ccapi/common/cci_array_internal.c
index d4975ba85f..72f7f67a15 100644
--- a/src/ccapi/common/cci_array_internal.c
+++ b/src/ccapi/common/cci_array_internal.c
@@ -1,7 +1,7 @@
 /*
  * $Header$
  *
- * Copyright 2006 Massachusetts Institute of Technology.
+ * Copyright 2006, 2007 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
  * Export of this software from the United States of America may
@@ -90,7 +90,9 @@ static cc_int32 cci_array_resize (cci_array_t io_array,
     return cci_check_error (err); 
 }
 
+#ifdef TARGET_OS_MAC
 #pragma mark -
+#endif
 
 /* ------------------------------------------------------------------------ */
 
@@ -168,7 +170,9 @@ cci_array_object_t cci_array_object_at_index (cci_array_t io_array,
     }
 }
 
+#ifdef TARGET_OS_MAC
 #pragma mark -
+#endif
     
 /* ------------------------------------------------------------------------ */
 
diff --git a/src/ccapi/common/cci_common.h b/src/ccapi/common/cci_common.h
index d9a6d5c621..56f21c3706 100644
--- a/src/ccapi/common/cci_common.h
+++ b/src/ccapi/common/cci_common.h
@@ -1,7 +1,7 @@
 /*
  * $Header$
  *
- * Copyright 2006 Massachusetts Institute of Technology.
+ * Copyright 2006, 2007 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
  * Export of this software from the United States of America may
@@ -43,8 +43,6 @@
 #else
 #include "win-mac.h"
 #define VECTOR_FUNCTIONS_INITIALIZER
-/* hide "#pragma mark" warnings on Windows */
-#pragma warning (disable: 4068)
 #endif
 
 #define k_cci_context_initial_ccache_name "Initial default ccache"
diff --git a/src/ccapi/common/cci_identifier.c b/src/ccapi/common/cci_identifier.c
index b6e9188920..dac2e15449 100644
--- a/src/ccapi/common/cci_identifier.c
+++ b/src/ccapi/common/cci_identifier.c
@@ -1,7 +1,7 @@
 /*
  * $Header$
  *
- * Copyright 2006 Massachusetts Institute of Technology.
+ * Copyright 2006, 2007 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
  * Export of this software from the United States of America may
@@ -151,7 +151,9 @@ cc_int32 cci_identifier_release (cci_identifier_t in_identifier)
     return cci_check_error (err);
 }
 
+#ifdef TARGET_OS_MAC
 #pragma mark -
+#endif
 
 /* ------------------------------------------------------------------------ */
 
@@ -233,7 +235,9 @@ cc_int32 cci_identifier_is_initialized (cci_identifier_t  in_identifier,
     return cci_check_error (err);    
 }
 
+#ifdef TARGET_OS_MAC
 #pragma mark -
+#endif
 
 /* ------------------------------------------------------------------------ */
 
-- 
cgit