Merge branch 'david-loffredo-portable-unused-param-fix' (#313)

diff --cc expat/Changes
index 96ef0fecddc32dc5860f14bcf729daf8e998cd02,33033af36f101e419234e7e137b9d0d266f73f10..896f538db31fe35b82abb629d91869493eee2e83
--- 1/expat/Changes
--- 2/expat/Changes
+++ b/expat/Changes
@@@ -31,7 -31,7 +31,7 @@@ Release x.x.x xxx xxx xx xxx
                      by using official API function rand_s (needs WinXP+)
               #14  Drop an OpenVMS support leftover
      #235 #268 ..
-        #270 #310  Address compiler warnings
 -       #270 #313  Address compiler warnings
++  #270 #310 #313  Address compiler warnings
      #282 #283 ..
         #284 #285  Address cppcheck warnings
         #294 #295  Address Clang Static Analyzer warnings

diff --cc expat/lib/xmltok.c
Simple merge