diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-01-01 22:52:27 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-01-01 22:52:27 +0000 |
| commit | b8529ae46439da3e4a5019ad760f447385cadd55 (patch) | |
| tree | c98b1899ed8bc7d0112f481d41579fed434c7c6b | |
| parent | ca4e5d91a96387bc270692f520b5a30c09856c16 (diff) | |
| download | netpbm-mirror-b8529ae46439da3e4a5019ad760f447385cadd55.tar.gz netpbm-mirror-b8529ae46439da3e4a5019ad760f447385cadd55.tar.xz netpbm-mirror-b8529ae46439da3e4a5019ad760f447385cadd55.zip | |
Release 10.69.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2366 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/pbm/pbmtomacp.c | 3 | ||||
| -rw-r--r-- | converter/ppm/ppmtoacad.c | 5 | ||||
| -rw-r--r-- | doc/HISTORY | 7 | ||||
| -rw-r--r-- | editor/specialty/pgmabel.c | 6 | ||||
| -rw-r--r-- | version.mk | 2 |
5 files changed, 13 insertions, 10 deletions
diff --git a/converter/pbm/pbmtomacp.c b/converter/pbm/pbmtomacp.c index ad0b22b1..4dd819db 100644 --- a/converter/pbm/pbmtomacp.c +++ b/converter/pbm/pbmtomacp.c @@ -12,11 +12,10 @@ #include <string.h> +#include "pm_c_util.h" #include "pbm.h" #include "macp.h" -#define TRUE 1 -#define FALSE 0 #define EQUAL 1 #define UNEQUAL 0 diff --git a/converter/ppm/ppmtoacad.c b/converter/ppm/ppmtoacad.c index 4f927f02..b5ee4d65 100644 --- a/converter/ppm/ppmtoacad.c +++ b/converter/ppm/ppmtoacad.c @@ -20,10 +20,9 @@ */ #include <stdio.h> -#include "ppm.h" -#define TRUE 1 -#define FALSE 0 +#include "pm_c_util.h" +#include "ppm.h" #define EOS '\0' diff --git a/doc/HISTORY b/doc/HISTORY index cefdfa35..79d41f9f 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,7 +4,12 @@ Netpbm. CHANGE HISTORY -------------- -14.12.26 BJH Release 10.69.00 +15.01.01 BJH Release 10.69.01 + + build: fix compile failure in pbmtomacp, ppmtoacad, pgmabel: + TRUE redefined. Introduced in Netpbm 10.69. + +14.12.25 BJH Release 10.69.00 pnmnorm: add -bsingle, -wsingle. diff --git a/editor/specialty/pgmabel.c b/editor/specialty/pgmabel.c index 4914c4be..1764c5d7 100644 --- a/editor/specialty/pgmabel.c +++ b/editor/specialty/pgmabel.c @@ -38,15 +38,15 @@ static const char* const version="$VER: pgmabel 1.009 (24 Jan 2002)"; #include <math.h> #include <stdlib.h> /* for calloc */ -#include "pgm.h" + +#include "pm_c_util.h" #include "mallocvar.h" +#include "pgm.h" #ifndef PID2 /* PI/2 (on AMIGA always defined) */ #define PID2 1.57079632679489661923 #endif -#define TRUE 1 -#define FALSE 0 /* some global variables */ static double *aldl, *ardl; /* pointer for weighting factors */ diff --git a/version.mk b/version.mk index 08a9e283..08861798 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 69 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |