diff options
| author | Kevin Koch <kpkoch@mit.edu> | 2007-11-21 14:05:43 +0000 |
|---|---|---|
| committer | Kevin Koch <kpkoch@mit.edu> | 2007-11-21 14:05:43 +0000 |
| commit | 4e0c8a6b396af3940cd1cff27c5d768686a03356 (patch) | |
| tree | 380b40faad2df47b32570e243d7d5523df4c7259 | |
| parent | ab8eafcf0c5139df878d29d5c717eaaae6761156 (diff) | |
| download | krb5-4e0c8a6b396af3940cd1cff27c5d768686a03356.zip krb5-4e0c8a6b396af3940cd1cff27c5d768686a03356.tar.gz krb5-4e0c8a6b396af3940cd1cff27c5d768686a03356.tar.bz2 | |
Conditionalize #pragma mark with TARGET_OS_MAC; remove any Windows #pragma disable
TargetVersion: 1.7
Component: krb5-libs
Ticket: 5594
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20168 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/ccapi/common/cci_cred_union.c | 22 | ||||
| -rw-r--r-- | src/ccapi/common/cci_stream.c | 32 |
2 files changed, 35 insertions, 19 deletions
diff --git a/src/ccapi/common/cci_cred_union.c b/src/ccapi/common/cci_cred_union.c index f0dbc1f..55da1e2 100644 --- a/src/ccapi/common/cci_cred_union.c +++ b/src/ccapi/common/cci_cred_union.c @@ -26,12 +26,10 @@ #include "cci_common.h" -#ifdef WIN32 -#pragma warning ( disable : 4068) +#ifdef TARGET_OS_MAC +#pragma mark - #endif -#pragma mark - - /* ------------------------------------------------------------------------ */ static cc_uint32 cci_credentials_v4_release (cc_credentials_v4_t *io_v4creds) @@ -199,7 +197,9 @@ static cc_uint32 cci_credentials_v4_write (cc_credentials_v4_t *in_v4creds, return cci_check_error (err); } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -302,7 +302,9 @@ static cc_uint32 cci_cc_data_write (cc_data *in_ccdata, return cci_check_error (err); } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -399,7 +401,9 @@ static cc_uint32 cci_cc_data_array_write (cc_data **in_ccdata_array, return cci_check_error (err); } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -584,7 +588,9 @@ static cc_uint32 cci_credentials_v5_write (cc_credentials_v5_t *in_v5creds, return cci_check_error (err); } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ diff --git a/src/ccapi/common/cci_stream.c b/src/ccapi/common/cci_stream.c index f8438e5..2f06789 100644 --- a/src/ccapi/common/cci_stream.c +++ b/src/ccapi/common/cci_stream.c @@ -27,10 +27,6 @@ #include "cci_common.h" #include "k5-platform.h" /* for byte swapping */ -#ifdef WIN32 -#pragma warning ( disable : 4068) -#endif - #if !defined(htonll) #define htonll(x) k5_htonll(x) #endif @@ -157,7 +153,9 @@ const char *cci_stream_data (cci_stream_t in_stream) return in_stream ? in_stream->data : NULL; } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -221,7 +219,9 @@ cc_uint32 cci_stream_write (cci_stream_t io_stream, return cci_check_error (err); } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -282,7 +282,9 @@ cc_uint32 cci_stream_write_string (cci_stream_t io_stream, return cci_check_error (err); } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -323,7 +325,9 @@ cc_uint32 cci_stream_write_int32 (cci_stream_t io_stream, return cci_check_error (err); } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -364,7 +368,9 @@ cc_uint32 cci_stream_write_uint32 (cci_stream_t io_stream, return cci_check_error (err); } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -406,7 +412,9 @@ cc_uint32 cci_stream_write_int64 (cci_stream_t io_stream, } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ @@ -447,7 +455,9 @@ cc_uint32 cci_stream_write_uint64 (cci_stream_t io_stream, return cci_check_error (err); } -#pragma mark - +#ifdef TARGET_OS_MAC +#pragma mark - +#endif /* ------------------------------------------------------------------------ */ |