diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2007-10-29 23:38:11 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2007-10-29 23:38:11 +0000 |
| commit | 9f1b5ea9bce5dece7d785d8d42c08717971a6723 (patch) | |
| tree | 8e2958904f4e66947e1b1659e500ee0494202435 | |
| parent | 365615a07ea528324818c89cf2447fbebf8fb95d (diff) | |
| download | krb5-9f1b5ea9bce5dece7d785d8d42c08717971a6723.tar.gz krb5-9f1b5ea9bce5dece7d785d8d42c08717971a6723.tar.xz krb5-9f1b5ea9bce5dece7d785d8d42c08717971a6723.zip | |
Define htonll, ntohll using k5_ versions if needed. Drop Mac-specific bits
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20151 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/ccapi/common/cci_stream.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/ccapi/common/cci_stream.c b/src/ccapi/common/cci_stream.c index b19e7bbfb5..8c0ef3356e 100644 --- a/src/ccapi/common/cci_stream.c +++ b/src/ccapi/common/cci_stream.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 @@ -25,20 +25,16 @@ */ #include "cci_common.h" - -#if TARGET_OS_MAC -#include <architecture/byte_order.h> +#include "k5-platform.h" /* for byte swapping */ #if !defined(htonll) -#define htonll(x) OSSwapHostToBigInt64(x) +#define htonll(x) k5_htonll(x) #endif #if !defined(ntohll) -#define ntohll(x) OSSwapBigToHostInt64(x) +#define ntohll(x) k5_ntohll(x) #endif -#endif /* TARGET_OS_MAC */ - struct cci_stream_d { char *data; cc_uint64 size; |