From 02c259aa1ae59c48ab0ae6cbb7168d6e26ca22a4 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Thu, 1 Nov 2007 08:08:32 +0000 Subject: [PATCH] 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 +++++- src/ccapi/lib/ccapi_ccache.c | 4 +++- src/ccapi/lib/ccapi_context.c | 10 +++++++++- src/ccapi/lib/ccapi_context_change_time.c | 4 +++- src/ccapi/server/ccs_array.c | 8 +++++++- src/ccapi/server/ccs_array.h | 8 +++++++- src/ccapi/server/ccs_cache_collection.c | 18 +++++++++++++++++- src/ccapi/server/ccs_ccache.c | 14 +++++++++++++- src/ccapi/server/ccs_ccache_iterator.c | 4 +++- src/ccapi/server/ccs_credentials_iterator.c | 4 +++- src/ccapi/server/ccs_list.c | 6 +++++- src/ccapi/server/ccs_list.h | 6 +++++- src/ccapi/server/ccs_list_internal.c | 6 +++++- src/ccapi/server/ccs_lock_state.c | 8 +++++++- src/ccapi/server/ccs_server.c | 10 +++++++++- src/ccapi/server/ccs_types.h | 8 +++++++- 18 files changed, 114 insertions(+), 20 deletions(-) diff --git a/src/ccapi/common/cci_array_internal.c b/src/ccapi/common/cci_array_internal.c index d4975ba85..72f7f67a1 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 d9a6d5c62..56f21c370 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 b6e918892..dac2e1544 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 /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/lib/ccapi_ccache.c b/src/ccapi/lib/ccapi_ccache.c index b2ea37a1d..f168c0a32 100644 --- a/src/ccapi/lib/ccapi_ccache.c +++ b/src/ccapi/lib/ccapi_ccache.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 @@ -140,7 +140,9 @@ cc_int32 cci_ccache_write (cc_ccache_t in_ccache, return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/lib/ccapi_context.c b/src/ccapi/lib/ccapi_context.c index 031c62a3a..7a165cf98 100644 --- a/src/ccapi/lib/ccapi_context.c +++ b/src/ccapi/lib/ccapi_context.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 @@ -75,7 +75,9 @@ cc_context_f cci_context_f_initializer = { static cc_int32 cci_context_sync (cci_context_t in_context, cc_uint32 in_launch); +#ifdef TARGET_OS_MAC #pragma mark - +#endif MAKE_INIT_FUNCTION(cci_thread_init); @@ -96,7 +98,9 @@ static int cci_thread_init (void) return err; } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -172,7 +176,9 @@ cc_int32 cc_initialize (cc_context_t *out_context, return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -739,7 +745,9 @@ cc_int32 ccapi_context_compare (cc_context_t in_context, return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/lib/ccapi_context_change_time.c b/src/ccapi/lib/ccapi_context_change_time.c index fb5b7ddae..f701c22fe 100644 --- a/src/ccapi/lib/ccapi_context_change_time.c +++ b/src/ccapi/lib/ccapi_context_change_time.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 @@ -98,7 +98,9 @@ static cc_int32 cci_context_change_time_update_identifier (cci_identifier_t in_ return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/server/ccs_array.c b/src/ccapi/server/ccs_array.c index b648a36a7..82aa02454 100644 --- a/src/ccapi/server/ccs_array.c +++ b/src/ccapi/server/ccs_array.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 @@ -80,7 +80,9 @@ cc_int32 ccs_client_array_remove (ccs_client_array_t io_array, return cci_array_remove (io_array, in_position); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -144,7 +146,9 @@ cc_int32 ccs_lock_array_move (ccs_lock_array_t io_array, return cci_array_move (io_array, in_position, in_new_position, out_real_new_position); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -199,7 +203,9 @@ cc_int32 ccs_callback_array_remove (ccs_callback_array_t io_array, return cci_array_remove (io_array, in_position); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/server/ccs_array.h b/src/ccapi/server/ccs_array.h index d4a6ba601..800e15de8 100644 --- a/src/ccapi/server/ccs_array.h +++ b/src/ccapi/server/ccs_array.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 @@ -45,7 +45,9 @@ cc_int32 ccs_client_array_insert (ccs_client_array_t io_array, cc_int32 ccs_client_array_remove (ccs_client_array_t io_array, cc_uint64 in_position); +#ifdef TARGET_OS_MAC #pragma mark - +#endif cc_int32 ccs_lock_array_new (ccs_lock_array_t *out_array); @@ -68,7 +70,9 @@ cc_int32 ccs_lock_array_move (ccs_lock_array_t io_array, cc_uint64 in_new_position, cc_uint64 *out_real_new_position); +#ifdef TARGET_OS_MAC #pragma mark - +#endif cc_int32 ccs_callback_array_new (ccs_callback_array_t *out_array); @@ -86,7 +90,9 @@ cc_int32 ccs_callback_array_insert (ccs_callback_array_t io_array, cc_int32 ccs_callback_array_remove (ccs_callback_array_t io_array, cc_uint64 in_position); +#ifdef TARGET_OS_MAC #pragma mark - +#endif cc_int32 ccs_callbackref_array_new (ccs_callbackref_array_t *out_array); diff --git a/src/ccapi/server/ccs_cache_collection.c b/src/ccapi/server/ccs_cache_collection.c index f838c9ade..df21ccb50 100644 --- a/src/ccapi/server/ccs_cache_collection.c +++ b/src/ccapi/server/ccs_cache_collection.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 @@ -126,7 +126,9 @@ cc_int32 ccs_cache_collection_compare_identifier (ccs_cache_collection_t in_cac return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -208,7 +210,9 @@ static cc_int32 ccs_cache_collection_invalidate_change_callback (ccs_callback_ow return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -250,7 +254,9 @@ static cc_int32 ccs_cache_collection_find_ccache_by_name (ccs_cache_collection_t return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -323,7 +329,9 @@ cc_int32 ccs_cache_collection_destroy_ccache (ccs_cache_collection_t io_cache_c return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -346,7 +354,9 @@ cc_int32 ccs_cache_collection_find_ccache_iterator (ccs_cache_collection_t in_c return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -388,7 +398,9 @@ cc_int32 ccs_cache_collection_find_credentials_iterator (ccs_cache_collection_t return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -528,8 +540,10 @@ cc_int32 ccs_cache_collection_set_default_ccache (ccs_cache_collection_t io_cac return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - #pragma mark -- IPC Messages -- +#endif /* ------------------------------------------------------------------------ */ @@ -981,7 +995,9 @@ static cc_int32 ccs_cache_collection_unlock (ccs_pipe_t in_client_pi return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/server/ccs_ccache.c b/src/ccapi/server/ccs_ccache.c index 40b652de7..ca41a8756 100644 --- a/src/ccapi/server/ccs_ccache.c +++ b/src/ccapi/server/ccs_ccache.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 @@ -261,7 +261,9 @@ cc_int32 ccs_ccache_release (ccs_ccache_t io_ccache) return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -303,7 +305,9 @@ cc_int32 ccs_ccache_compare_name (ccs_ccache_t in_ccache, return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -419,7 +423,9 @@ cc_int32 ccs_ccache_notify_default_state_changed (ccs_ccache_t io_ccac return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -442,7 +448,9 @@ cc_int32 ccs_ccache_find_credentials_iterator (ccs_ccache_t in_cc return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -479,8 +487,10 @@ cc_int32 ccs_ccache_write_name (ccs_ccache_t in_ccache, return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - #pragma mark -- IPC Messages -- +#endif /* ------------------------------------------------------------------------ */ @@ -1087,7 +1097,9 @@ static cc_int32 ccs_ccache_clear_kdc_time_offset (ccs_ccache_t io_ccac return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/server/ccs_ccache_iterator.c b/src/ccapi/server/ccs_ccache_iterator.c index 77d83f1b0..77d8eda45 100644 --- a/src/ccapi/server/ccs_ccache_iterator.c +++ b/src/ccapi/server/ccs_ccache_iterator.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 @@ -100,7 +100,9 @@ static cc_int32 ccs_ccache_iterator_clone (ccs_ccache_iterator_t io_ccache_ite return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/server/ccs_credentials_iterator.c b/src/ccapi/server/ccs_credentials_iterator.c index e36c7f500..b13a294b1 100644 --- a/src/ccapi/server/ccs_credentials_iterator.c +++ b/src/ccapi/server/ccs_credentials_iterator.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 @@ -102,7 +102,9 @@ static cc_int32 ccs_credentials_iterator_clone (ccs_credentials_iterator_t io_c return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/server/ccs_list.c b/src/ccapi/server/ccs_list.c index 2fd86da0f..bc34fa257 100644 --- a/src/ccapi/server/ccs_list.c +++ b/src/ccapi/server/ccs_list.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 @@ -96,7 +96,9 @@ cc_int32 ccs_cache_collection_list_release (ccs_cache_collection_list_t io_list) return ccs_list_release (io_list); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -224,7 +226,9 @@ cc_int32 ccs_ccache_list_iterator_release (ccs_ccache_list_iterator_t io_list_it return ccs_list_iterator_release (io_list_iterator); } +#ifdef TARGET_OS_MAC #pragma mark- +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/server/ccs_list.h b/src/ccapi/server/ccs_list.h index 435821a5b..734621697 100644 --- a/src/ccapi/server/ccs_list.h +++ b/src/ccapi/server/ccs_list.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 @@ -47,7 +47,9 @@ cc_int32 ccs_cache_collection_list_remove (ccs_cache_collection_list_t io_list, cc_int32 ccs_cache_collection_list_release (ccs_cache_collection_list_t io_list); +#ifdef TARGET_OS_MAC #pragma mark - +#endif cc_int32 ccs_ccache_list_new (ccs_ccache_list_t *out_list); @@ -88,7 +90,9 @@ cc_int32 ccs_ccache_list_iterator_next (ccs_ccache_list_iterator_t io_list_iter cc_int32 ccs_ccache_list_iterator_release (ccs_ccache_list_iterator_t io_list_iterator); +#ifdef TARGET_OS_MAC #pragma mark - +#endif cc_int32 ccs_credentials_list_new (ccs_credentials_list_t *out_list); diff --git a/src/ccapi/server/ccs_list_internal.c b/src/ccapi/server/ccs_list_internal.c index 2f99ebdb8..d74a0ff9e 100644 --- a/src/ccapi/server/ccs_list_internal.c +++ b/src/ccapi/server/ccs_list_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 @@ -68,7 +68,9 @@ static cc_int32 ccs_list_iterator_update (ccs_list_iterator_t io_list_iterator, ccs_list_action_enum in_action, cc_uint64 in_object_index); +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -406,7 +408,9 @@ cc_int32 ccs_list_push_front (ccs_list_t io_list, return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/server/ccs_lock_state.c b/src/ccapi/server/ccs_lock_state.c index 3893fc9a1..516a1e26a 100644 --- a/src/ccapi/server/ccs_lock_state.c +++ b/src/ccapi/server/ccs_lock_state.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 @@ -89,7 +89,9 @@ cc_int32 ccs_lock_state_release (ccs_lock_state_t io_lock_state) return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -214,7 +216,9 @@ static cc_int32 ccs_lock_status_grant_lock (ccs_lock_state_t io_lock_state, return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -364,7 +368,9 @@ static cc_int32 ccs_lock_status_try_to_grant_pending_locks (ccs_lock_state_t io_ return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/server/ccs_server.c b/src/ccapi/server/ccs_server.c index 2a4cb0f7b..5954d661c 100644 --- a/src/ccapi/server/ccs_server.c +++ b/src/ccapi/server/ccs_server.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 @@ -70,7 +70,9 @@ int main (int argc, const char *argv[]) return cci_check_error (err) ? 1 : 0; } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -80,7 +82,9 @@ cc_int32 ccs_server_new_identifier (cci_identifier_t *out_identifier) g_server_id)); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -192,7 +196,9 @@ cc_int32 ccs_server_client_is_valid (ccs_pipe_t in_client_pipe, return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -297,7 +303,9 @@ static cc_int32 ccs_server_request_demux (ccs_pipe_t in_client_pipe return cci_check_error (err); } +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/server/ccs_types.h b/src/ccapi/server/ccs_types.h index 1c0870bf0..56056b99e 100644 --- a/src/ccapi/server/ccs_types.h +++ b/src/ccapi/server/ccs_types.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,7 +43,9 @@ typedef struct cci_array_d *ccs_callbackref_array_t; typedef struct cci_array_d *ccs_lock_array_t; +#ifdef TARGET_OS_MAC #pragma mark - +#endif /* ccs_os_pipe_t is IPC-specific so it's special cased here */ @@ -65,7 +67,9 @@ typedef int ccs_pipe_t; /* Unix domain socket */ #endif #endif +#ifdef TARGET_OS_MAC #pragma mark - +#endif struct ccs_callback_d; typedef struct ccs_callback_d *ccs_callback_t; @@ -81,7 +85,9 @@ typedef struct ccs_list_iterator_d *ccs_ccache_list_iterator_t; typedef struct ccs_list_d *ccs_credentials_list_t; typedef struct ccs_list_iterator_d *ccs_credentials_list_iterator_t; +#ifdef TARGET_OS_MAC #pragma mark - +#endif struct ccs_client_d; typedef struct ccs_client_d *ccs_client_t; -- 2.26.2