diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 1997-04-21 00:30:35 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 1997-04-21 00:30:35 +0000 |
commit | 11eae40ef2363ceb774c867741958eb8809f4acc (patch) | |
tree | 1a3d6a01de1a5e344109e285a2cce2810f0243b3 /devel/libdlmalloc/files/patch-aa | |
parent | Merge from 2.2. (diff) |
Upgrade to 2.6.4.
Mention that doc files are at http://g.oswego.edu/dl/html/malloc.html
Notes
Notes:
svn path=/head/; revision=6255
Diffstat (limited to 'devel/libdlmalloc/files/patch-aa')
-rw-r--r-- | devel/libdlmalloc/files/patch-aa | 82 |
1 files changed, 30 insertions, 52 deletions
diff --git a/devel/libdlmalloc/files/patch-aa b/devel/libdlmalloc/files/patch-aa index ccd6dc8853e5..7a087a30f483 100644 --- a/devel/libdlmalloc/files/patch-aa +++ b/devel/libdlmalloc/files/patch-aa @@ -1,52 +1,30 @@ -*** malloc-2.5.3b.c.orig Sun Mar 26 10:50:54 1995 ---- malloc-2.5.3b.c Fri Apr 7 19:21:29 1995 -*************** -*** 271,276 **** ---- 271,278 ---- - - /* preliminaries */ - -+ #include <sys/param.h> -+ - #ifndef __STD_C - #ifdef __STDC__ - #define __STD_C 1 -*************** -*** 1365,1373 **** - } - - -- - /* Derivatives */ - - #if __STD_C - Void_t* valloc(size_t bytes) - #else ---- 1367,1375 ---- - } - - - /* Derivatives */ - -+ #if 0 - #if __STD_C - Void_t* valloc(size_t bytes) - #else -*************** -*** 1394,1400 **** - while (sz-- > 0) *q++ = 0; - return p; - } -! - #if __STD_C - void cfree(Void_t *mem) - #else ---- 1396,1402 ---- - while (sz-- > 0) *q++ = 0; - return p; - } -! #endif - #if __STD_C - void cfree(Void_t *mem) - #else - +--- malloc-2.6.4.c.orig Thu Nov 28 06:07:12 1996 ++++ malloc-2.6.4.c Sun Apr 20 17:25:42 1997 +@@ -216,6 +216,8 @@ + + /* Preliminaries */ + ++#include <sys/param.h> ++ + #ifndef __STD_C + #ifdef __STDC__ + #define __STD_C 1 +@@ -495,7 +497,7 @@ + # ifdef _SC_PAGE_SIZE + # define malloc_getpagesize sysconf(_SC_PAGE_SIZE) + # else +-# if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE) ++# if (defined(BSD) && (BSD < 199306)) || defined(DGUX) || defined(HAVE_GETPAGESIZE) + extern size_t getpagesize(); + # define malloc_getpagesize getpagesize() + # else +@@ -789,7 +791,9 @@ + #else /* INTERNAL_LINUX_C_LIB */ + + #if __STD_C ++# if !(defined(BSD) && (BSD >= 199306)) + extern Void_t* sbrk(ptrdiff_t); ++# endif + #else + extern Void_t* sbrk(); + #endif |