diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-01-03 01:32:25 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-01-03 01:32:25 +0000 |
| commit | ea0846b5215870caf455e33c8d8bfe0a5aba01ed (patch) | |
| tree | d5fbb44246a990cae92babbe1e977c62df219462 | |
| parent | b8529ae46439da3e4a5019ad760f447385cadd55 (diff) | |
| download | netpbm-mirror-ea0846b5215870caf455e33c8d8bfe0a5aba01ed.tar.gz netpbm-mirror-ea0846b5215870caf455e33c8d8bfe0a5aba01ed.tar.xz netpbm-mirror-ea0846b5215870caf455e33c8d8bfe0a5aba01ed.zip | |
Release 10.69.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2372 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | doc/HISTORY | 8 | ||||
| -rw-r--r-- | lib/libpm.c | 5 | ||||
| -rw-r--r-- | lib/pm.h | 4 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 79d41f9f..d8994e91 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,10 +4,16 @@ Netpbm. CHANGE HISTORY -------------- +15.01.01 BJH Release 10.69.02 + + Libnetpbm: fix external header file pm.h so it does not include + internal header file pm_c_util.h. Introduced in Netpbm + 10.69.00 (December 2014). + 15.01.01 BJH Release 10.69.01 build: fix compile failure in pbmtomacp, ppmtoacad, pgmabel: - TRUE redefined. Introduced in Netpbm 10.69. + TRUE redefined. Introduced in Netpbm 10.69 (December 2014). 14.12.25 BJH Release 10.69.00 diff --git a/lib/libpm.c b/lib/libpm.c index fa8ae4db..cf5ff17b 100644 --- a/lib/libpm.c +++ b/lib/libpm.c @@ -278,10 +278,11 @@ pm_error(const char format[], ...) { -bool +int pm_have_float_format(void) { /*---------------------------------------------------------------------------- - Return true iff %f, %e, and %g work in format strings for pm_message, etc. + Return 1 if %f, %e, and %g work in format strings for pm_message, etc.; + 0 otherwise. Where they don't "work," that means the specifier just appears itself in the formatted strings, e.g. "the number is g". diff --git a/lib/pm.h b/lib/pm.h index a24ea7bb..47cbfe83 100644 --- a/lib/pm.h +++ b/lib/pm.h @@ -23,8 +23,6 @@ #include <sys/stat.h> #include <fcntl.h> -#include "pm_c_util.h" - #ifdef __cplusplus extern "C" { #endif @@ -221,7 +219,7 @@ pm_errormsg(const char format[], ...); void PM_GNU_PRINTF_ATTR(1,2) pm_error (const char reason[], ...); -bool +int pm_have_float_format(void); /* Obsolete - use shhopt and user's manual instead */ diff --git a/version.mk b/version.mk index 08861798..4b69b3ff 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 69 -NETPBM_POINT_RELEASE = 1 +NETPBM_POINT_RELEASE = 2 |