Changeset 173 for trunk

Timestamp:

Aug 18, 2008, 8:26:30 PM (16 years ago)

Author:

katerina

Message:

x dnmalloc compile error (ticket #110).

Location:

trunk

Files:

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

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.4.5)
+AM_INIT_AUTOMAKE(samhain, 2.4.5a)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ -1 @@
-2.4.5:
+2.4.5a:
+        * fix compile problem in dnmalloc.c (remove prototypes for
+          memset/memcpy), problem reported by Juergen Daubert
+        
+2.4.5 (07-08-2008):
         * testscripts: 'chmod -R' -> 'chmod -f -R', since Solaris 10
           bails out on a chmod on a dangling link

trunk/src/dnmalloc.c

@@ -97 +97 @@
    further to 1.0:
    Valgrind client requests inserted (#define USE_VALGRIND)
-   Fix malloc_consolidate (nextchunk->fd, nextchunk->bck may be NULL)
+   Fix: malloc_consolidate (nextchunk->fd, nextchunk->bck may be NULL)
    Portability: minsize = 32 bit on 64bit architecture
    Minor cleanups
+   Fix: eliminate prototypes for memset, memcpy (they're in string.h)
 
    There may be some bugs left in this version. please use with caution.
@@ -586 +587 @@
 
 #ifdef WIN32
-/* On Win32 memset and memcpy are already declared in windows.h */
+  /* On Win32 memset and memcpy are already declared in windows.h */
 #else
 #if __STD_C
-void* memset(void*, int, size_t);
-void* memcpy(void*, const void*, size_t);
+  /* Defined in string.h */
 #else
 Void_t* memset();