[GNUnet-SVN] r18456 - in gnunet/src: arm include util

[gnunet]

Author: grothoff
Date: 2011-12-06 14:54:18 +0100 (Tue, 06 Dec 2011)
New Revision: 18456

Modified:
   gnunet/src/arm/gnunet-service-arm_interceptor.c
   gnunet/src/include/gnunet_common.h
   gnunet/src/util/common_endian.c
Log:
use uint64_t instead of long long for GNUNET_ntohll/GNUNET_htonll

Modified: gnunet/src/arm/gnunet-service-arm_interceptor.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm_interceptor.c     2011-12-06 13:47:15 UTC 
(rev 18455)
+++ gnunet/src/arm/gnunet-service-arm_interceptor.c     2011-12-06 13:54:18 UTC 
(rev 18456)
@@ -989,7 +989,6 @@
     return;
   GNUNET_CONTAINER_DLL_remove (serviceListeningInfoList_head,
                                serviceListeningInfoList_tail, sli);
-#ifndef MINGW
   use_lsocks = GNUNET_NO;
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_have_value (cfg, sli->serviceName,
@@ -997,9 +996,6 @@
     use_lsocks =
         GNUNET_CONFIGURATION_get_value_yesno (cfg, sli->serviceName,
                                               "DISABLE_SOCKET_FORWARDING");
-#else
-  use_lsocks = GNUNET_YES;
-#endif
   if (GNUNET_NO != use_lsocks)
   {
     accept_and_forward (sli);

Modified: gnunet/src/include/gnunet_common.h
===================================================================
--- gnunet/src/include/gnunet_common.h  2011-12-06 13:47:15 UTC (rev 18455)
+++ gnunet/src/include/gnunet_common.h  2011-12-06 13:54:18 UTC (rev 18456)
@@ -417,20 +417,20 @@
 /* ************************* endianess conversion ****************** */
 
 /**
- * Convert a long-long to host-byte-order.
+ * Convert unsigned 64-bit integer to host-byte-order.
  * @param n the value in network byte order
  * @return the same value in host byte order
  */
-unsigned long long
-GNUNET_ntohll (unsigned long long n);
+uint64_t
+GNUNET_ntohll (uint64_t n);
 
 /**
- * Convert a long long to network-byte-order.
+ * Convert unsigned 64-bit integer to network-byte-order.
  * @param n the value in host byte order
  * @return the same value in network byte order
  */
-unsigned long long
-GNUNET_htonll (unsigned long long n);
+uint64_t
+GNUNET_htonll (uint64_t n);
 
 
 /* ************************* allocation functions ****************** */

Modified: gnunet/src/util/common_endian.c
===================================================================
--- gnunet/src/util/common_endian.c     2011-12-06 13:47:15 UTC (rev 18455)
+++ gnunet/src/util/common_endian.c     2011-12-06 13:54:18 UTC (rev 18456)
@@ -29,23 +29,23 @@
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
 
-unsigned long long
-GNUNET_ntohll (unsigned long long n)
+uint64_t
+GNUNET_ntohll (uint64_t)
 {
 #if __BYTE_ORDER == __BIG_ENDIAN
   return n;
 #else
-  return (((unsigned long long) ntohl (n)) << 32) + ntohl (n >> 32);
+  return (((uint64_t) ntohl (n)) << 32) + ntohl (n >> 32);
 #endif
 }
 
-unsigned long long
-GNUNET_htonll (unsigned long long n)
+uint64_t
+GNUNET_htonll (uint64_t n)
 {
 #if __BYTE_ORDER == __BIG_ENDIAN
   return n;
 #else
-  return (((unsigned long long) htonl (n)) << 32) + htonl (n >> 32);
+  return (((uint64_t) htonl (n)) << 32) + htonl (n >> 32);
 #endif
 }