about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-05-29 01:38:20 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-05-29 01:38:20 +0000
commit01a4b48cb7bb6fc50a7ca055af2b32c210354ada (patch)
tree9a72d8300e44ac03171af91a04b3708d2b3f9207
parent57f3570732d49aa9994b7f86acb71b73e3bb0984 (diff)
downloadnetpbm-mirror-01a4b48cb7bb6fc50a7ca055af2b32c210354ada.tar.gz
netpbm-mirror-01a4b48cb7bb6fc50a7ca055af2b32c210354ada.tar.xz
netpbm-mirror-01a4b48cb7bb6fc50a7ca055af2b32c210354ada.zip
Release 10.50.06
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@1227 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rw-r--r--lib/util/vasprintf.c2
-rw-r--r--version.mk2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 547628c8..33021b1e 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+10.05.29 BJH  Release 10.50.06
+
+              build: fix incorrect determination of when vasprintf() exists
+              in libc.
+
 10.05.20 BJH  Release 10.50.05
 
               pamarith: fix memory leak.
diff --git a/lib/util/vasprintf.c b/lib/util/vasprintf.c
index 9d8fe590..ed8fc808 100644
--- a/lib/util/vasprintf.c
+++ b/lib/util/vasprintf.c
@@ -7,7 +7,7 @@
 
 #include "nstring.h"
 
-#if defined(__GNUC__) && !defined(__MINGW32__)
+#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__))
   #define HAVE_VASPRINTF 1
 #else
   #define HAVE_VASPRINTF 0
diff --git a/version.mk b/version.mk
index 147235af..aee28872 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 50
-NETPBM_POINT_RELEASE =  5
+NETPBM_POINT_RELEASE =  6