summaryrefslogtreecommitdiff
path: root/libyasm
diff options
context:
space:
mode:
authorPeter Johnson <peter@tortall.net>2001-11-03 04:11:22 +0000
committerPeter Johnson <peter@tortall.net>2001-11-03 04:11:22 +0000
commit665eddf5d795a64e2203256b9d76156d6e2a51c7 (patch)
treefa1d660e7eb6f885c4ab278462e18f58c663a948 /libyasm
parent79e945c33c1ebc4c1946d1df32ed02bec2b9fb4e (diff)
downloadyasm-665eddf5d795a64e2203256b9d76156d6e2a51c7.tar.gz
Conditional x* prototypes on !DMALLOC (as they're defined by dmalloc.h if
DMALLOC is enabled). svn path=/trunk/yasm/; revision=311
Diffstat (limited to 'libyasm')
-rw-r--r--libyasm/util.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/libyasm/util.h b/libyasm/util.h
index 4fba8452..a56c3e9c 100644
--- a/libyasm/util.h
+++ b/libyasm/util.h
@@ -26,9 +26,6 @@
# include <stddef.h>
#endif
-/* strdup() implementation with error checking (using xmalloc). */
-char *xstrdup(const char *str);
-
#if !defined(HAVE_MERGESORT)
int mergesort(void *base, size_t nmemb, size_t size,
int (*compar)(const void *, const void *));
@@ -67,11 +64,16 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
#include "ternary.h"
+#ifndef DMALLOC
+/* strdup() implementation with error checking (using xmalloc). */
+char *xstrdup(const char *str);
+
/* Error-checking memory allocation routines in xmalloc.c. */
void *xmalloc(size_t size);
void *xcalloc(size_t nelem, size_t elsize);
void *xrealloc(void *oldmem, size_t size);
void xfree(void *p);
+#endif
#ifdef HAVE_SYS_CDEFS_H
# include <sys/cdefs.h>