Move strndup() declaration outside !DMALLOC #ifdef, as it's not defined by

the dmalloc library.

svn path=/trunk/yasm/; revision=661

diff --git a/libyasm/util.h b/libyasm/util.h
index 05d8d7828eff667291b98059eb8fbacb202b4df9..51bc282e0f0da0687f3864cdee2cb40af0bf89e6 100644 (file)
--- a/libyasm/util.h
+++ b/libyasm/util.h
@@ -126,7 +126,6 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 #else
 /* strdup() implementation with error checking (using xmalloc). */
 /*@only@*/ char *xstrdup(const char *str);
-/*@only@*/ char *xstrndup(const char *str, size_t len);
 
 /* Error-checking memory allocation routines in xmalloc.c. */
 /*@only@*/ /*@out@*/ void *xmalloc(size_t size);
@@ -136,6 +135,8 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p) /*@modifies p@*/;
 #endif
 
+/*@only@*/ char *xstrndup(const char *str, size_t len);
+
 /* Bit-counting: used primarily by HAMT but also in a few other places. */
 #define SK5    0x55555555
 #define SK3    0x33333333

diff --git a/src/util.h b/src/util.h
index 05d8d7828eff667291b98059eb8fbacb202b4df9..51bc282e0f0da0687f3864cdee2cb40af0bf89e6 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -126,7 +126,6 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 #else
 /* strdup() implementation with error checking (using xmalloc). */
 /*@only@*/ char *xstrdup(const char *str);
-/*@only@*/ char *xstrndup(const char *str, size_t len);
 
 /* Error-checking memory allocation routines in xmalloc.c. */
 /*@only@*/ /*@out@*/ void *xmalloc(size_t size);
@@ -136,6 +135,8 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p) /*@modifies p@*/;
 #endif
 
+/*@only@*/ char *xstrndup(const char *str, size_t len);
+
 /* Bit-counting: used primarily by HAMT but also in a few other places. */
 #define SK5    0x55555555
 #define SK3    0x33333333

diff --git a/util.h b/util.h
index 05d8d7828eff667291b98059eb8fbacb202b4df9..51bc282e0f0da0687f3864cdee2cb40af0bf89e6 100644 (file)
--- a/util.h
+++ b/util.h
@@ -126,7 +126,6 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 #else
 /* strdup() implementation with error checking (using xmalloc). */
 /*@only@*/ char *xstrdup(const char *str);
-/*@only@*/ char *xstrndup(const char *str, size_t len);
 
 /* Error-checking memory allocation routines in xmalloc.c. */
 /*@only@*/ /*@out@*/ void *xmalloc(size_t size);
@@ -136,6 +135,8 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p) /*@modifies p@*/;
 #endif
 
+/*@only@*/ char *xstrndup(const char *str, size_t len);
+
 /* Bit-counting: used primarily by HAMT but also in a few other places. */
 #define SK5    0x55555555
 #define SK3    0x33333333