fixing 1592

2 files changed, 5 insertions, 15 deletions

diff --git a/src/include/platform.h b/src/include/platform.h
index 30fa8f9b5..b36cd83a4 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -83,7 +83,12 @@
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#if HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
 #include <netinet/ip.h> /* superset of previous */
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 2470c0ce2..2b75a1196 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -23,15 +23,6 @@
  * @brief get paths used by the program
  * @author Milan
  */
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <string.h>
@@ -435,10 +426,4 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
   return tmp;
 }
 
-#if 0                           /* keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
-}
-#endif
 /* end of os_installation.c */