diff options
| author | miwi <miwi@FreeBSD.org> | 2007-07-13 23:02:43 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2007-07-13 23:02:43 +0800 |
| commit | 355bb5bf1c6398802980bd3bdc34c6df783a0c33 (patch) | |
| tree | d8a25cca617db42b8e7a46dac8b83323d5736696 /devel/sfslite-dbg | |
| parent | fc2b24fcf5bec867558ac6aca7af5e04a37de8c1 (diff) | |
| download | freebsd-ports-gnome-355bb5bf1c6398802980bd3bdc34c6df783a0c33.tar.gz freebsd-ports-gnome-355bb5bf1c6398802980bd3bdc34c6df783a0c33.tar.zst freebsd-ports-gnome-355bb5bf1c6398802980bd3bdc34c6df783a0c33.zip | |
- Fix build after devel/dmalloc
- Fix build with gcc 4.2
Submitted by: pointyhat via pav
Petar Petrov <pesho.petrov@gmail.com>
Approved by: maintainer
Diffstat (limited to 'devel/sfslite-dbg')
| -rw-r--r-- | devel/sfslite-dbg/files/patch-async_arena.h | 11 | ||||
| -rw-r--r-- | devel/sfslite-dbg/files/patch-async_sysconf.h | 26 |
2 files changed, 37 insertions, 0 deletions
diff --git a/devel/sfslite-dbg/files/patch-async_arena.h b/devel/sfslite-dbg/files/patch-async_arena.h new file mode 100644 index 000000000000..5d09ca4c1046 --- /dev/null +++ b/devel/sfslite-dbg/files/patch-async_arena.h @@ -0,0 +1,11 @@ +--- async/arena.h 2005-11-01 18:20:29.000000000 +0200 ++++ async/arena.h_new 2007-07-07 00:36:09.000000000 +0300 +@@ -61,7 +61,7 @@ + #ifdef DMALLOC + char *_strdup_leap (const char *, int, const char *str) + { return strcpy ((char *) alloc (1 + strlen (str), 1), str); } +- char *dmalloc_strdup (const char *, int, const char *str, int) ++ char *dmalloc_strndup (const char *, int, const char *str, int, int) + { return strcpy ((char *) alloc (1 + strlen (str), 1), str); } + #endif /* DMALLOC */ + diff --git a/devel/sfslite-dbg/files/patch-async_sysconf.h b/devel/sfslite-dbg/files/patch-async_sysconf.h new file mode 100644 index 000000000000..a714e599a7fa --- /dev/null +++ b/devel/sfslite-dbg/files/patch-async_sysconf.h @@ -0,0 +1,26 @@ +--- async/sysconf.h 2005-11-01 18:20:33.000000000 +0200 ++++ async/sysconf.h_new 2007-07-07 00:36:00.000000000 +0300 +@@ -494,11 +494,12 @@ + #endif /* HAVE_MEMORY_H */ + #include <dmalloc.h> + #undef memcpy ++#undef memmove + #undef xfree + #define memcpy(to, from, len) \ +- _dmalloc_memcpy((char *) (to), (const char *) (from), len) ++ _dmalloc_memcpy(__FILE__, __LINE__, (char *) (to), (const char *) (from), len) + #define memmove(to, from, len) \ +- _dmalloc_bcopy((const char *) (from), (char *) (to), len) ++ _dmalloc_bcopy(__FILE__, __LINE__, (const char *) (from), (char *) (to), len) + /* Work around Dmalloc's misunderstanding of free's definition */ + + #if DMALLOC_VERSION_MAJOR >= 5 +@@ -508,7 +509,7 @@ + dmalloc_malloc (f, l, s, DMALLOC_FUNC_MALLOC, 0, 0) + #define _xfree_leap(f, l, p) dmalloc_free (f, l, p, DMALLOC_FUNC_FREE) + #undef xstrdup +-#define xstrdup(__s) ((char *) dmalloc_strdup(__FILE__, __LINE__, __s, 1)) ++#define xstrdup(__s) ((char *) dmalloc_strndup(__FILE__, __LINE__, __s, -1, 1)) + #endif /* DMALLOC_VERSION_MAJOR >= 5 */ + + static inline void |