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

diff --git a/src/ccapi/common/cci_stream.c b/src/ccapi/common/cci_stream.c
index b19e7bbfb508af57b8c40c317202ef604e99e5f9..8c0ef3356e325d13ffe08ce2a57d955b51104f5a 100644 (file)
--- 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;