1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From 3080c0be6da7477954862e1ed9a267ce39b268ad Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Tue, 27 Aug 2024 16:04:16 +0200
Subject: [PATCH 1/2] workround with define uuid_time uuid_time64
---
uuid.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/uuid.c b/uuid.c
index ae024e7..73136f0 100644
--- a/uuid.c
+++ b/uuid.c
@@ -27,6 +27,12 @@
#ifdef HAVE_UUID
+/* workround with define uuid_time uuid_time64 */
+#ifdef uuid_time
+#undef uuid_time
+#define HAVE_TIME64
+#endif
+
#if PHP_VERSION_ID < 80000
#define VALUE_ERROR(n,name,msg) php_error_docref(NULL, E_WARNING, "Argument #%d (%s) %s", n, name, msg); RETURN_FALSE
#define RETURN_THROWS() return
--
2.46.2
From 77720b2b4c2c57cd18ffc5dbf32a247b6952abed Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Mon, 30 Sep 2024 11:45:34 +0200
Subject: [PATCH 2/2] fix workaround
---
uuid.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/uuid.c b/uuid.c
index 73136f0..c45aa2a 100644
--- a/uuid.c
+++ b/uuid.c
@@ -28,9 +28,10 @@
#ifdef HAVE_UUID
/* workround with define uuid_time uuid_time64 */
+/* Also see https://bugzilla.redhat.com/2315645 */
#ifdef uuid_time
#undef uuid_time
-#define HAVE_TIME64
+extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
#endif
#if PHP_VERSION_ID < 80000
--
2.46.2
|
