Release 10.47.46

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2002 9d0c8265-081b-0410-96cb-a4ca84ce46f8

5 files changed, 25 insertions, 34 deletions

diff --git a/common.mk b/common.mk
index a74074de..379b387b 100644
--- a/common.mk
+++ b/common.mk
@@ -138,10 +138,10 @@ IMPORTINC_LIB_FILES := $(IMPORTINC_LIB_HEADERS:%=importinc/%)
 IMPORTINC_LIB_UTIL_FILES := $(IMPORTINC_LIB_UTIL_HEADERS:%=importinc/%)
 
 importinc: \
-  importinc/netpbm \
   $(IMPORTINC_ROOT_FILES) \
   $(IMPORTINC_LIB_FILES) \
   $(IMPORTINC_LIB_UTIL_FILES) \
+  importinc/netpbm \
 
 importinc/netpbm:
 	mkdir -p importinc
diff --git a/doc/HISTORY b/doc/HISTORY
index 60ec70ec..6927a827 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,13 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+13.09.26 BJH  Release 10.47.46
+
+              Fixes for Mingw build with MSYS shell.
+
+              libnetpbm, pnmpsnr, ppmcie on Mac OS X: fix bogus printing of
+              floating point numbers.
+
 13.06.27 BJH  Release 10.47.45
 
               giftopnm: fix bug: erroneously claims GIF ends prematurely.
diff --git a/lib/util/vasprintf.c b/lib/util/vasprintf.c
index ed8fc808..6d350f88 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
 vasprintfN(const char ** const resultP,
diff --git a/pm_config.in.h b/pm_config.in.h
index c44bc72c..51a7b966 100644
--- a/pm_config.in.h
+++ b/pm_config.in.h
@@ -118,50 +118,37 @@ extern int rand();
 #if (defined(SYSV) && !defined(VMS))
 #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
 
 /* CONFIGURE: If your system has the setmode() function, set HAVE_SETMODE.
 ** If you do, and also the O_BINARY file mode, pm_init() will set the mode
 ** of stdin and stdout to binary for all Netpbm programs.
 ** You need this with Cygwin (Windows).
 */
-#ifdef __CYGWIN__
+
+#ifdef _WIN32
+#define MSVCRT 1
+#else
+#define MSVCRT 0
+#endif
+
+#if MSVCRT || defined(__CYGWIN__) || defined(DJGPP)
 #define HAVE_SETMODE
 #endif
 
 /* #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))
 #endif
 
 #ifdef DJGPP
-#define HAVE_SETMODE
 #define lstat stat
 #endif /* DJGPP */
 
diff --git a/version.mk b/version.mk
index bb5d49b8..62757ee7 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 45
+NETPBM_POINT_RELEASE = 46