[GNUnet-SVN] r12383 - in gnunet: . src/include src/util

[gnunet]

Author: grothoff
Date: 2010-07-28 22:00:56 +0200 (Wed, 28 Jul 2010)
New Revision: 12383

Modified:
   gnunet/configure.ac
   gnunet/src/include/platform.h
   gnunet/src/util/os_installation.c
Log:
fixing 1592

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2010-07-28 19:27:22 UTC (rev 12382)
+++ gnunet/configure.ac 2010-07-28 20:00:56 UTC (rev 12383)
@@ -244,7 +244,7 @@
 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]))
 
 # Checks for headers that are only required on some systems or opional (and 
where we do NOT abort if they are not there)
-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])
+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])
 
 # test for libgmp
 gmp=0

Modified: gnunet/src/include/platform.h
===================================================================
--- gnunet/src/include/platform.h       2010-07-28 19:27:22 UTC (rev 12382)
+++ gnunet/src/include/platform.h       2010-07-28 20:00:56 UTC (rev 12383)
@@ -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>

Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c   2010-07-28 19:27:22 UTC (rev 12382)
+++ gnunet/src/util/os_installation.c   2010-07-28 20:00:56 UTC (rev 12383)
@@ -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 @@
   return tmp;
 }
 
-#if 0                           /* keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
-}
-#endif
 /* end of os_installation.c */