diff options
| author | John Bowler <jbowler@acm.org> | 2012-02-13 11:45:22 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-02-13 11:45:22 -0600 |
| commit | bce7988230178cd1cc222bc25bb52c134b9e1117 (patch) | |
| tree | dc8d027bc6f410d0c58ec83d289745d0738b352e /scripts/pnglibconf.mak | |
| parent | 864270e18f2cbeabcd235c900991d6bb40beb73a (diff) | |
| download | libpng-bce7988230178cd1cc222bc25bb52c134b9e1117.tar.gz | |
[libpng16] Fixed fixed/float API export conditionals. 1) If FIXED_POINT or
FLOATING_POINT options were switched off, png.h ended up with lone ';'
characters. This is not valid ANSI-C outside a function. The ';'
characters have been moved inside the definition of PNG_FP_EXPORT and
PNG_FIXED_EXPORT. 2) If either option was switched off, the declaration
of the corresponding functions were completely omitted, even though some
of them are still used internally. The result is still valid, but
produces warnings from gcc with some warning options (including -Wall). The
fix is to cause png.h to declare the functions with PNG_INTERNAL_FUNCTION
when png.h is included from pngpriv.h.
Diffstat (limited to 'scripts/pnglibconf.mak')
| -rwxr-xr-x | scripts/pnglibconf.mak | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/pnglibconf.mak b/scripts/pnglibconf.mak index c04578f31..d12c6ed7c 100755 --- a/scripts/pnglibconf.mak +++ b/scripts/pnglibconf.mak @@ -18,7 +18,8 @@ SED = sed COPY = cp DELETE = rm -f ECHO = echo -DFA_XTRA = # Appended to scripts/options.awk +DFA_XTRA = # Put your configuration file here, see scripts/pnglibconf.dfa. Eg: +# DFA_XTRA = pngusr.dfa # CPPFLAGS should contain the options to control the result, # but DEFS and CFLAGS are also supported here, override @@ -41,7 +42,7 @@ pnglibconf.h: pnglibconf.dfn $(COPY) dfn3.out $@ $(DELETE) dfn.c dfn1.out dfn2.out dfn3.out -pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk $(srcdir)/pngconf.h +pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk $(srcdir)/pngconf.h $(DFA_XTRA) $(DELETE) $@ dfn1.out dfn2.out $(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2 $(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2 |