diff options
-rw-r--r-- | expat/Changes | 2 | ||||
-rw-r--r-- | expat/lib/xmlparse.c | 9 | ||||
-rw-r--r-- | expat/lib/xmlrole.c | 5 | ||||
-rw-r--r-- | expat/lib/xmltok.c | 5 | ||||
-rw-r--r-- | expat/tests/runtests.c | 5 | ||||
-rw-r--r-- | expat/xmlwf/xmlfile.c | 5 |
6 files changed, 19 insertions, 12 deletions
diff --git a/expat/Changes b/expat/Changes index 78ea0832..45e45dd3 100644 --- a/expat/Changes +++ b/expat/Changes @@ -5,6 +5,7 @@ NOTE: We are looking for help with a few things: Release 2.4.2 xxx xxx xx xxxx Other changes: #509 #510 Link againgst libm for function "isnan" + #513 #514 Include expat_config.h as early as possible #497 Autotools: Include files with release archives: - buildconf.sh - fuzz/*.c @@ -13,6 +14,7 @@ Release 2.4.2 xxx xxx xx xxxx - multi-config CMake generators (e.g. Ninja Multi-Config) Special thanks to: + Dong-hee Na Joergen Ibsen Kai Pastor diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 5ba56eae..2811d863 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -32,6 +32,7 @@ Copyright (c) 2019 David Loffredo <loffredo@steptools.com> Copyright (c) 2019-2020 Ben Wagner <bungeman@chromium.org> Copyright (c) 2019 Vadim Zeitlin <vadim@zeitlins.org> + Copyright (c) 2021 Dong-hee Na <donghee.na@python.org> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -54,6 +55,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#define XML_BUILDING_EXPAT 1 + +#include <expat_config.h> + #if ! defined(_GNU_SOURCE) # define _GNU_SOURCE 1 /* syscall prototype */ #endif @@ -84,14 +89,10 @@ # include <errno.h> #endif -#define XML_BUILDING_EXPAT 1 - #ifdef _WIN32 # include "winconfig.h" #endif -#include <expat_config.h> - #include "ascii.h" #include "expat.h" #include "siphash.h" diff --git a/expat/lib/xmlrole.c b/expat/lib/xmlrole.c index 08173b0f..77746ee4 100644 --- a/expat/lib/xmlrole.c +++ b/expat/lib/xmlrole.c @@ -15,6 +15,7 @@ Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org> Copyright (c) 2017 Rhodri James <rhodri@wildebeest.org.uk> Copyright (c) 2019 David Loffredo <loffredo@steptools.com> + Copyright (c) 2021 Dong-hee Na <donghee.na@python.org> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -37,14 +38,14 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <expat_config.h> + #include <stddef.h> #ifdef _WIN32 # include "winconfig.h" #endif -#include <expat_config.h> - #include "expat_external.h" #include "internal.h" #include "xmlrole.h" diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c index f2b6b406..502ca1ad 100644 --- a/expat/lib/xmltok.c +++ b/expat/lib/xmltok.c @@ -20,6 +20,7 @@ Copyright (c) 2017 Benbuck Nason <bnason@netflix.com> Copyright (c) 2017 José Gutiérrez de la Concha <jose@zeroc.com> Copyright (c) 2019 David Loffredo <loffredo@steptools.com> + Copyright (c) 2021 Dong-hee Na <donghee.na@python.org> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -42,6 +43,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <expat_config.h> + #include <stddef.h> #include <string.h> /* memcpy */ #include <stdbool.h> @@ -50,8 +53,6 @@ # include "winconfig.h" #endif -#include <expat_config.h> - #include "expat_external.h" #include "internal.h" #include "xmltok.h" diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index 45ba5d59..3f514c37 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -17,6 +17,7 @@ Copyright (c) 2018 Marco Maggi <marco.maggi-ipsu@poste.it> Copyright (c) 2019 David Loffredo <loffredo@steptools.com> Copyright (c) 2020 Tim Gates <tim.gates@iress.com> + Copyright (c) 2021 Dong-hee Na <donghee.na@python.org> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -39,12 +40,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <expat_config.h> + #if defined(NDEBUG) # undef NDEBUG /* because test suite relies on assert(...) at the moment */ #endif -#include <expat_config.h> - #include <assert.h> #include <stdlib.h> #include <stdio.h> diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c index 50d02f8f..e3d6259a 100644 --- a/expat/xmlwf/xmlfile.c +++ b/expat/xmlwf/xmlfile.c @@ -14,6 +14,7 @@ Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org> Copyright (c) 2017 Rhodri James <rhodri@wildebeest.org.uk> Copyright (c) 2019 David Loffredo <loffredo@steptools.com> + Copyright (c) 2021 Dong-hee Na <donghee.na@python.org> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -36,6 +37,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <expat_config.h> + #include <stdio.h> #include <stdlib.h> #include <stddef.h> @@ -46,8 +49,6 @@ # include "winconfig.h" #endif -#include <expat_config.h> - #include "expat.h" #include "internal.h" /* for UNUSED_P only */ #include "xmlfile.h" |