diff options
| -rw-r--r-- | doc/HISTORY | 3 | ||||
| -rw-r--r-- | lib/util/vasprintf.c | 7 | ||||
| -rw-r--r-- | pm_config.in.h | 31 |
3 files changed, 11 insertions, 30 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 5edcf422..7995a7b7 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -9,6 +9,9 @@ not yet BJH Release 10.64.00 pngtopam: fix bug: ignores -gamma. Introduced in 10.48 (September 2009). + libnetpbm, pnmpsnr, ppmcie on Mac OS X: fix bogus printing of + floating point numbers. + 13.06.29 BJH Release 10.63.00 Add pamtowinicon, winicontopam. Thanks Ludolf Holzheid diff --git a/lib/util/vasprintf.c b/lib/util/vasprintf.c index e074befb..209827eb 100644 --- a/lib/util/vasprintf.c +++ b/lib/util/vasprintf.c @@ -5,13 +5,10 @@ #include <stdlib.h> #include <string.h> +#include "pm_config.h" #include "nstring.h" -#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__)) - #define HAVE_VASPRINTF 1 -#else - #define HAVE_VASPRINTF 0 -#endif + void pm_vasprintf(const char ** const resultP, diff --git a/pm_config.in.h b/pm_config.in.h index d8e578a3..9459be02 100644 --- a/pm_config.in.h +++ b/pm_config.in.h @@ -99,31 +99,6 @@ #if defined(SYSV) #include <malloc.h> #endif -/* extern char* malloc(); */ -/* extern char* realloc(); */ -/* extern char* calloc(); */ - -/* CONFIGURE: Some systems don't have vfprintf(), which we need for the -** error-reporting routines. If you compile and get a link error about -** this routine, uncomment the first define, which gives you a vfprintf -** that uses the theoretically non-portable but fairly common routine -** _doprnt(). If you then get a link error about _doprnt, or -** message-printing doesn't look like it's working, try the second -** define instead. -*/ -/* #define NEED_VFPRINTF1 */ -/* #define NEED_VFPRINTF2 */ - -/* CONFIGURE: Some systems don't have strstr(), which some routines need. -** If you compile and get a link error about this routine, uncomment the -** define, which gives you a strstr. -*/ -/* #define NEED_STRSTR */ - -/* CONFIGURE: Set this option if your compiler uses strerror(errno) -** instead of sys_errlist[errno] for error messages. -*/ -#define A_STRERROR /* MSVCRT means we're using the Microsoft Visual C++ runtime library. @@ -161,6 +136,12 @@ /* #define HAVE_SETMODE */ +#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__)) + #define HAVE_VASPRINTF 1 +#else + #define HAVE_VASPRINTF 0 +#endif + #ifdef __amigaos__ #include <clib/exec_protos.h> #define getpid() ((pid_t)FindTask(NULL)) |