organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-13 08:02:56 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge branch 'vadz-SIPHASH_MAIN-warn-fix' (pull request #100)

Browse source
This commit is contained in:
Sebastian Pipping 2017-07-25 20:12:59 +02:00
commit 6f4858c057
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
expat/Changes
View file

@ -14,10 +14,12 @@ Release 2.2.? ????????????????
#23 Test suite: Fix memory leaks
Rely on macro HAVE_ARC4RANDOM_BUF (rather than __CloudABI__)
for CloudABI
#100 Fix use of SIPHASH_MAIN in siphash.h
Special thanks to:
Pascal Cuoq
Rhodri James
Vadim Zeitlin
Viktor Szakats
and
Core Infrastructure Initiative

5
expat/lib/siphash.h
View file

@ -11,6 +11,9 @@
* --------------------------------------------------------------------------
* HISTORY:
*
* 2017-07-25 (Vadim Zeitlin)
* - Fix use of SIPHASH_MAIN macro
*
* 2017-07-05 (Sebastian Pipping)
* - Use _SIP_ULL macro to not require a C++11 compiler if compiled as C++
* - Add const qualifiers at two places
@ -350,7 +353,7 @@ static int sip24_valid(void) {
} /* sip24_valid() */
#if SIPHASH_MAIN
#ifdef SIPHASH_MAIN
#include <stdio.h>