Changeset 520 for trunk

Timestamp:

Mar 19, 2017, 8:43:36 PM (8 years ago)

Author:

katerina

Message:

Fix for ticket #415 (build issue with musl libc).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/dnmalloc.c (modified) (2 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 4.2.1:
+        * fix build issue with musl libc (report & patch by A. Kuster)
         * fix case sensitivity (tcp vs TCP, udp vs UDP) in portcheck
         directives (reported by Anton H.)

trunk/src/dnmalloc.c

@@ -822 +822 @@
  * it may actually raise an error.
  */
-#if defined(HAVE_MALLOC_H) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if defined(HAVE_MALLOC_H) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && defined(__GLIBC__)
 #include <malloc.h>
 #else
@@ -5525 +5525 @@
                 struct timeval tv1;
                 struct timeval tv2;
-                u_int rnd[(128 - 2*sizeof(struct timeval)) / sizeof(u_int)];
+                unsigned char rnd[(128 - 2*sizeof(struct timeval)) / sizeof(unsigned char)];
         } rdat;
 #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)