From 82b1f0b4cf88fe5fc757b6718763a3bad5e59166 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Thu, 1 Jan 2015 22:50:26 +0000 Subject: Fix TRUE, FALSE redefined git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2365 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- doc/HISTORY | 4 ++-- editor/specialty/pgmabel.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/HISTORY b/doc/HISTORY index 1bb3d1e6..e90c408d 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -13,8 +13,8 @@ not yet BJH Release 10.70.00 code deletes temporary files via atexit). Thanks Ludolf Holzheid . - build: fix compile failure in pbmtomacp.c, ppmtoacad.c: TRUE - redefined. Introduced in Netpbm 10.69. + build: fix compile failure in pbmtomacp, ppmtoacad, pgmabel: + TRUE redefined. Introduced in Netpbm 10.69. 14.12.25 BJH Release 10.69.00 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 #include /* 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 */ -- cgit 1.4.1