diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-01-03 01:25:27 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-01-03 01:25:27 +0000 |
| commit | af4792d67fece463885dabbc5deda5581b46d3bb (patch) | |
| tree | 6a93586fe4706941a1b504f7fe31e9600eb6afad | |
| parent | d757fb6d240cb136b015f91e5957f39c0adb757f (diff) | |
| download | netpbm-mirror-af4792d67fece463885dabbc5deda5581b46d3bb.tar.gz netpbm-mirror-af4792d67fece463885dabbc5deda5581b46d3bb.tar.xz netpbm-mirror-af4792d67fece463885dabbc5deda5581b46d3bb.zip | |
Fix external header file pm.h so it doesn't include internal header file pm_c_util.h
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2371 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/other/yuy2topam.c | 5 | ||||
| -rw-r--r-- | lib/libpm.c | 5 | ||||
| -rw-r--r-- | lib/pm.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/converter/other/yuy2topam.c b/converter/other/yuy2topam.c index 3ce64f5d..40ab98b3 100644 --- a/converter/other/yuy2topam.c +++ b/converter/other/yuy2topam.c @@ -15,6 +15,7 @@ #include <stdio.h> #include <string.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "pm.h" #include "pam.h" @@ -59,8 +60,8 @@ parseCommandLine(int argc, const char ** argv, &cmdlineP->height, &heightSpec, 0); opt.opt_table = option_def; - opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ - opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ + opt.short_allowed = false; /* We have no short (old-fashioned) options */ + opt.allowNegNum = false; /* We have no parms that are negative numbers */ pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ diff --git a/lib/libpm.c b/lib/libpm.c index 69fe1dbf..4374bbe3 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 c2fbfcb5..47cbfe83 100644 --- a/lib/pm.h +++ b/lib/pm.h @@ -23,8 +23,6 @@ #include <sys/stat.h> #include <fcntl.h> -#include "netpbm/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 */ |