diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-01-01 22:46:12 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-01-01 22:46:12 +0000 |
| commit | 7652f3c840bb58c3dd40933a903943811131c97b (patch) | |
| tree | f499902710807b299a41eebd47a7f38441df5584 | |
| parent | eee95b6900e46ac0ec05c05dbf08fd616717ee16 (diff) | |
| download | netpbm-mirror-7652f3c840bb58c3dd40933a903943811131c97b.tar.gz netpbm-mirror-7652f3c840bb58c3dd40933a903943811131c97b.tar.xz netpbm-mirror-7652f3c840bb58c3dd40933a903943811131c97b.zip | |
Fix TRUE, FALSE redefined
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2364 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/ppm/ppmtoacad.c | 5 | ||||
| -rw-r--r-- | doc/HISTORY | 4 |
2 files changed, 4 insertions, 5 deletions
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 cfaad04e..1bb3d1e6 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 <ludolf.holzheid@gmx.de>. - build: fix compile failure in pbmtomacp.c: TRUE redefined. - Introduced in Netpbm 10.69. + build: fix compile failure in pbmtomacp.c, ppmtoacad.c: TRUE + redefined. Introduced in Netpbm 10.69. 14.12.25 BJH Release 10.69.00 |