eliminating last dependency on util code from wlan helper by inlining

3 files changed, 1 insertions, 9 deletions

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 167187c23..f57c18cb7 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -52,12 +52,6 @@
 #define GNUNET_UTIL_VERSION 0x00090000
 
 /**
- * Name used for "services" that are actually command-line
- * programs invoked by the end user.
- */
-#define GNUNET_CLIENT_SERVICE_NAME "client"
-
-/**
  * Named constants for return values.  The following
  * invariants hold: "GNUNET_NO == 0" (to allow "if (GNUNET_NO)")
  * "GNUNET_OK != GNUNET_SYSERR", "GNUNET_OK != GNUNET_NO", "GNUNET_NO != GNUNET_SYSERR"
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 67ff11781..a14d5f0bb 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -89,7 +89,6 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
                               socklen_t * address_len);
 
 
-#ifdef MINGW
 /**
  * Box a native socket (and check that it is a socket).
  *
@@ -98,7 +97,6 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
  */
 struct GNUNET_NETWORK_Handle *
 GNUNET_NETWORK_socket_box_native (SOCKTYPE fd);
-#endif
 
 
 /**
diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h
index c39349c92..2856fd838 100644
--- a/src/include/gnunet_server_lib.h
+++ b/src/include/gnunet_server_lib.h
@@ -46,7 +46,7 @@ extern "C"
 #define GNUNET_SERVER_MAX_MESSAGE_SIZE 65536
 
 /**
- * Largest supported message.
+ * Smallest supported message.
  */
 #define GNUNET_SERVER_MIN_BUFFER_SIZE sizeof (struct GNUNET_MessageHeader)