diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/include/platform.h | 5 | ||||
-rw-r--r-- | src/util/os_installation.c | 15 |
3 files changed, 6 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 40608c5ce..ba9261aa7 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -244,7 +244,7 @@ AC_HEADER_STDC | |||
244 | AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files])) | 244 | AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files])) |
245 | 245 | ||
246 | # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there) | 246 | # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there) |
247 | AC_CHECK_HEADERS([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h]) | 247 | AC_CHECK_HEADERS([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_sysm.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h]) |
248 | 248 | ||
249 | # test for libgmp | 249 | # test for libgmp |
250 | gmp=0 | 250 | gmp=0 |
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 @@ | |||
83 | #include <netdb.h> | 83 | #include <netdb.h> |
84 | #include <sys/socket.h> | 84 | #include <sys/socket.h> |
85 | #include <sys/un.h> | 85 | #include <sys/un.h> |
86 | #if HAVE_NETINET_IN_H | ||
86 | #include <netinet/in.h> | 87 | #include <netinet/in.h> |
88 | #endif | ||
89 | #if HAVE_NETINET_IN_SYSTM_H | ||
90 | #include <netinet/in_systm.h> | ||
91 | #endif | ||
87 | #include <netinet/ip.h> /* superset of previous */ | 92 | #include <netinet/ip.h> /* superset of previous */ |
88 | #include <arpa/inet.h> | 93 | #include <arpa/inet.h> |
89 | #include <netinet/tcp.h> | 94 | #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 @@ | |||
23 | * @brief get paths used by the program | 23 | * @brief get paths used by the program |
24 | * @author Milan | 24 | * @author Milan |
25 | */ | 25 | */ |
26 | |||
27 | #ifdef __cplusplus | ||
28 | extern "C" | ||
29 | { | ||
30 | #if 0 /* keep Emacsens' auto-indent happy */ | ||
31 | } | ||
32 | #endif | ||
33 | #endif | ||
34 | |||
35 | #include <sys/stat.h> | 26 | #include <sys/stat.h> |
36 | #include <stdlib.h> | 27 | #include <stdlib.h> |
37 | #include <string.h> | 28 | #include <string.h> |
@@ -435,10 +426,4 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind) | |||
435 | return tmp; | 426 | return tmp; |
436 | } | 427 | } |
437 | 428 | ||
438 | #if 0 /* keep Emacsens' auto-indent happy */ | ||
439 | { | ||
440 | #endif | ||
441 | #ifdef __cplusplus | ||
442 | } | ||
443 | #endif | ||
444 | /* end of os_installation.c */ | 429 | /* end of os_installation.c */ |