aboutsummaryrefslogtreecommitdiff
path: root/icons
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2023-02-18 07:14:05 +0000
committerSimon Tatham <anakin@pobox.com>2023-02-18 08:55:13 +0000
commit873d613dd597f550b1b64946c4577b012d61d1c9 (patch)
treee6c458a8dfc349ca4be8755f3bcc26658e0958d7 /icons
parentdbced097ac16973f648ad2f024cc2302fa187578 (diff)
downloadpuzzles-873d613dd597f550b1b64946c4577b012d61d1c9.zip
puzzles-873d613dd597f550b1b64946c4577b012d61d1c9.tar.gz
puzzles-873d613dd597f550b1b64946c4577b012d61d1c9.tar.bz2
puzzles-873d613dd597f550b1b64946c4577b012d61d1c9.tar.xz
Fix missing statics and #includes on variables.
After Ben fixed all the unwanted global functions by using gcc's -Wmissing-declarations to spot any that were not predeclared, I remembered that clang has -Wmissing-variable-declarations, which does the same job for global objects. Enabled it in -DSTRICT=ON, and made the code clean under it. Mostly this was just a matter of sticking 'static' on the front of things. One variable was outright removed ('verbose' in signpost.c) because after I made it static clang was then able to spot that it was also unused. The more interesting cases were the ones where declarations had to be _added_ to header files. In particular, in COMBINED builds, puzzles.h now arranges to have predeclared each 'game' structure defined by a puzzle backend. Also there's a new tiny header file gtk.h, containing the declarations of xpm_icons and n_xpm_icons which are exported by each puzzle's autogenerated icon source file and by no-icon.c. Happily even the real XPM icon files were generated by our own Perl script rather than being raw xpm output from ImageMagick, so there was no difficulty adding the corresponding #include in there.
Diffstat (limited to 'icons')
-rwxr-xr-xicons/cicon.pl1
1 files changed, 1 insertions, 0 deletions
diff --git a/icons/cicon.pl b/icons/cicon.pl
index a9f214e..4a5327a 100755
--- a/icons/cicon.pl
+++ b/icons/cicon.pl
@@ -21,6 +21,7 @@ foreach $f (@ARGV) {
}
# Now output.
+print "#include \"gtk.h\"\n"; # for declarations of xpm_icons and n_xpm_icons
foreach $line (@xpms) { print $line; }
print "const char *const *const xpm_icons[] = {\n";
for ($i = 0; $i < $k; $i++) { print " xpm_icon_$i,\n"; }