Skip to content

Commit

Permalink
Fix two build regressions
Browse files Browse the repository at this point in the history
This fixes commit f6aa448.
The path to symbols.def in Makefile.am was incorrect.

This also fixes commit 12877b1
and commit 9ed344a.
The unnecessary ';' after PNG_REMOVED in png.h broke compilation in
pedantic mode.

Reviewed-by: Cosmin Truta <[email protected]>
Signed-off-by: John Bowler <[email protected]>
Signed-off-by: Cosmin Truta <[email protected]>
  • Loading branch information
jbowler authored and ctruta committed Feb 26, 2025
1 parent fbe0914 commit b35a98b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ pnglibconf.c: scripts/pnglibconf/pnglibconf.dfa scripts/pnglibconf/options.awk p
mv $*.tf5 $@

# Symbol checks (.def and .out files should match)
scripts/pnglibconf/symbols.chk: scripts/pnglibconf/checksym.awk scripts/pnglibconf/symbols.def \
scripts/pnglibconf/symbols.chk: scripts/pnglibconf/checksym.awk scripts/symbols.def \
scripts/pnglibconf/symbols.out

.out.chk:
Expand Down
6 changes: 3 additions & 3 deletions png.h
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@ PNG_EXPORT(int, png_convert_to_rfc1123_buffer, (char out[29],

/* Removed from libpng 1.7 onwards; use png_convert_to_rfc1123_buffer. */
PNG_REMOVED(png_const_charp, png_convert_to_rfc1123, (png_structrp png_ptr,
png_const_timep ptime),PNG_DEPRECATED);
png_const_timep ptime),PNG_DEPRECATED)
#endif

#ifdef PNG_CONVERT_tIME_SUPPORTED
Expand Down Expand Up @@ -2011,9 +2011,9 @@ PNG_FIXED_EXPORT(void, png_set_cLLI_fixed, (png_const_structrp png_ptr,

#ifdef PNG_eXIf_SUPPORTED
PNG_REMOVED(png_uint_32, png_get_eXIf, (png_const_structrp png_ptr,
png_inforp info_ptr, png_bytep *exif),PNG_DEPRECATED);
png_inforp info_ptr, png_bytep *exif),PNG_DEPRECATED)
PNG_REMOVED(void, png_set_eXIf, (png_const_structrp png_ptr,
png_inforp info_ptr, png_bytep exif),PNG_DEPRECATED);
png_inforp info_ptr, png_bytep exif),PNG_DEPRECATED)

PNG_EXPORT(png_uint_32, png_get_eXIf_1, (png_const_structrp png_ptr,
png_const_inforp info_ptr, png_uint_32 *num_exif, png_bytep *exif));
Expand Down

0 comments on commit b35a98b

Please sign in to comment.