Solaris/dbpware-for-solaris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expat: update to 2.4.8

Browse Source
This commit is contained in:
Tom G. Christensen
2022-04-10 15:37:16 +02:00
parent 805a9ea17e
commit aaa395cbb2
6 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
expat/src/expat-2.2.9-no-stdint_h.patch
View File

@@ -1,11 +0,0 @@
--- expat-2.2.9/lib/siphash.h.stdint_h 2019-09-21 17:23:24.000000000 +0000
+++ expat-2.2.9/lib/siphash.h 2020-02-08 21:15:30.156684000 +0000
@@ -103,7 +103,7 @@
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
#else
-# include <stdint.h> /* uint64_t uint32_t uint8_t */
+# include <sys/types.h> /* uint64_t uint32_t uint8_t */
#endif
/*

33
expat/src/expat-2.4.8-no-stdint_h.patch Normal file
View File

@@ -0,0 +1,33 @@
--- expat-2.4.8/tests/runtests.c.stdint 2022-03-28 23:11:43.000000000 +0000
+++ expat-2.4.8/tests/runtests.c 2022-04-10 15:25:45.480002000 +0000
@@ -53,7 +53,7 @@
#include <stddef.h> /* ptrdiff_t */
#include <ctype.h>
#include <limits.h>
-#include <stdint.h> /* intptr_t uint64_t */
+#include <inttypes.h> /* intptr_t uint64_t */
#if ! defined(__cplusplus)
# include <stdbool.h>
--- expat-2.4.8/lib/siphash.h.stdint 2022-04-10 15:24:46.740007000 +0000
+++ expat-2.4.8/lib/siphash.h 2022-04-10 15:25:09.120002000 +0000
@@ -99,7 +99,7 @@
#define SIPHASH_H
#include <stddef.h> /* size_t */
-#include <stdint.h> /* uint64_t uint32_t uint8_t */
+#include <inttypes.h> /* uint64_t uint32_t uint8_t */
/*
* Workaround to not require a C++11 compiler for using ULL suffix
--- expat-2.4.8/lib/xmlparse.c.stdint 2022-03-28 23:11:43.000000000 +0000
+++ expat-2.4.8/lib/xmlparse.c 2022-04-10 15:25:17.180022000 +0000
@@ -78,7 +78,7 @@
#include <limits.h> /* UINT_MAX */
#include <stdio.h> /* fprintf */
#include <stdlib.h> /* getenv, rand_s */
-#include <stdint.h> /* uintptr_t */
+#include <inttypes.h> /* uintptr_t */
#include <math.h> /* isnan */
#ifdef _WIN32

27
expat/src/expat-2.4.8-no-strtof.patch Normal file
View File

@@ -0,0 +1,27 @@
--- expat-2.4.8/xmlwf/xmltchar.h.strtof 2022-03-28 16:51:41.000000000 +0000
+++ expat-2.4.8/xmlwf/xmltchar.h 2022-04-10 15:29:32.600005000 +0000
@@ -74,6 +74,6 @@
# define tmain main
# define tremove remove
# define tchar char
-# define tcstof strtof
+# define tcstof strtod
# define tcstoull strtoull
#endif /* not XML_UNICODE */
--- expat-2.4.8/tests/runtests.c.strtof 2022-04-10 15:26:11.240002000 +0000
+++ expat-2.4.8/tests/runtests.c 2022-04-10 15:30:05.040002000 +0000
@@ -11765,12 +11765,12 @@
static float
portableNAN() {
- return strtof("nan", NULL);
+ return strtod("nan", NULL);
}
static float
portableINFINITY() {
- return strtof("infinity", NULL);
+ return strtod("infinity", NULL);
}
START_TEST(test_billion_laughs_attack_protection_api) {