--- netpbm-10.34/lib/util/nstring.c- 2007-08-19 20:47:29 +0400 +++ netpbm-10.34/lib/util/nstring.c 2007-08-19 20:47:35 +0400 @@ -130,6 +130,7 @@ #include "nstring.h" +#if 0 #ifdef isdigit #undef isdigit #endif @@ -830,7 +831,7 @@ strsepN(char ** const stringP, const cha return retval; } - +#endif int stripeq(const char * const comparand, @@ -886,7 +887,7 @@ stripeq(const char * const comparand, } - +#if 0 const char * memmemN(const char * const haystack, size_t const haystacklen, @@ -904,3 +905,4 @@ memmemN(const char * const haystack, return NULL; } +#endif --- netpbm-10.34/lib/util/nstring.h- 2007-08-19 20:47:29 +0400 +++ netpbm-10.34/lib/util/nstring.h 2007-08-19 20:50:13 +0400 @@ -1,6 +1,7 @@ #ifndef _NSTRING_H #define _NSTRING_H +#include #include #include #include @@ -114,6 +115,15 @@ streq(const char * const comparand, when freeing storage allocated by the Netpbm asprintfN(). */ + +#define vsnprintfN(str,size,fmt,ap,ret) (*(ret)=vsnprintf(str,size,fmt,ap)) +#define snprintfN snprintf +#define asprintfN asprintf +#define strsepN strsep +#define memmemN memmem +#define strfree free + +#if 0 extern const char * const strsol; int @@ -139,16 +149,19 @@ strfree(const char * const string); const char * strsepN(char ** const stringP, const char * const delim); +#endif int stripeq(const char * const comparand, const char * const comparator); +#if 0 const char * memmemN(const char * const haystack, size_t const haystacklen, const char * const needle, size_t const needlelen); +#endif #ifdef __cplusplus }