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

[gnunet]

Author: grothoff
Date: 2014-10-18 14:21:05 +0200 (Sat, 18 Oct 2014)
New Revision: 34373

Modified:
   gnunet/configure.ac
   gnunet/src/util/common_allocation.c
Log:
Hello Christian,

I had to write a little patch to fix gnunet FTBFS on kfreebsd, you'll
find it attached. Would you consider adding to your SVN ?

Thanks,
Bertrand



Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2014-10-15 00:55:53 UTC (rev 34372)
+++ gnunet/configure.ac 2014-10-18 12:21:05 UTC (rev 34373)
@@ -634,7 +634,7 @@
 
 
 # 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([malloc.h malloc/malloc.h 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 ucred.h sys/ucred.h endian.h 
sys/endian.h execinfo.h])
+AC_CHECK_HEADERS([malloc.h malloc/malloc.h malloc/malloc_np.h 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 ucred.h sys/ucred.h endian.h sys/endian.h execinfo.h])
 
 # FreeBSD requires something more funky for netinet/in_systm.h and 
netinet/ip.h...
 AC_CHECK_HEADERS([sys/types.h netinet/in_systm.h netinet/in.h netinet/ip.h],,,

Modified: gnunet/src/util/common_allocation.c
===================================================================
--- gnunet/src/util/common_allocation.c 2014-10-15 00:55:53 UTC (rev 34372)
+++ gnunet/src/util/common_allocation.c 2014-10-18 12:21:05 UTC (rev 34373)
@@ -197,7 +197,7 @@
 #if WINDOWS
 #define M_SIZE(p) _msize (p)
 #endif
-#ifdef FREEBSD
+#if HAVE_MALLOC_NP_H
 #include <malloc_np.h>
 #endif
 #if HAVE_MALLOC_USABLE_SIZE