Browse Source
This pupnp release address some win32 issues reported after we bumped to 1.14. Removed patches: - 0001-ThreadPool-[...].patch -> Fixed upstream by d4cfec4674c6877bad350 - win32-remove-wro[...].patch -> Fixed upstream by d86f4159e13d00a9eb59a This release also fixes an XML descriptor parsing error: <https://github.com/pupnp/pupnp/issues/412>pull/141/head
committed by
Jean-Baptiste Kempf
4 changed files with 2 additions and 71 deletions
@ -1,32 +0,0 @@ |
|||
From 3560d8d3f1a5b7e88b9d6282c09b2caf37beedc8 Mon Sep 17 00:00:00 2001 |
|||
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> |
|||
Date: Thu, 4 Aug 2022 15:55:55 +0200 |
|||
Subject: [PATCH] ThreadPool: Fix non UCRT builds |
|||
|
|||
---
|
|||
upnp/src/threadutil/ThreadPool.c | 5 +++++ |
|||
1 file changed, 5 insertions(+) |
|||
|
|||
diff --git a/upnp/src/threadutil/ThreadPool.c b/upnp/src/threadutil/ThreadPool.c
|
|||
index 49fa8486..e5883d31 100644
|
|||
--- a/upnp/src/threadutil/ThreadPool.c
|
|||
+++ b/upnp/src/threadutil/ThreadPool.c
|
|||
@@ -1297,10 +1297,15 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
|
|||
_tzset(); |
|||
tzflag++; |
|||
} |
|||
+#ifdef _UCRT
|
|||
long itz = 0; |
|||
_get_timezone(&itz); |
|||
tz->tz_minuteswest = (int)(itz / 60); |
|||
_get_daylight(&tz->tz_dsttime); |
|||
+#else
|
|||
+ tz->tz_minuteswest = _timezone / 60;
|
|||
+ tz->tz_dsttime = _daylight;
|
|||
+#endif
|
|||
} |
|||
|
|||
return 0; |
|||
--
|
|||
2.35.1 |
|||
|
|||
@ -1 +1 @@ |
|||
ae6ae72a5e784a0f9508af94c4070627e791660fa37966e9825643fd0f88b171826bda9a2ec872d4961bf3454e5a9cd716127f0bdf6e63c789c4e22aab0b7e71 pupnp-release-1.14.13.tar.gz |
|||
dde2563eaacdd288066012f001b819ec25ab51bc36aef23db71d2eb67eef778b6b2b10b35a2f6b3041ecef20167e873e1c54e17fc4a26e8d1d9f408e2050279d pupnp-release-1.14.15.tar.gz |
|||
|
|||
@ -1,35 +0,0 @@ |
|||
From 90dee7da8ed96ea6e2ade2dd0f085bfb575449b3 Mon Sep 17 00:00:00 2001 |
|||
From: Alaric Senat <dev.asenat@posteo.net> |
|||
Date: Tue, 13 Sep 2022 19:48:09 +0200 |
|||
Subject: [PATCH] win32: remove wrong safe wrappers |
|||
|
|||
Theses wrapper were too naively written and are causing a lot of |
|||
regressions on windows. |
|||
|
|||
This has been addressed upstream [1]. And is simply reverted for now, |
|||
waiting for a new release. |
|||
|
|||
[1] https://github.com/pupnp/pupnp/issues/411 |
|||
---
|
|||
ixml/inc/posix_overwrites.h | 6 ------ |
|||
1 file changed, 6 deletions(-) |
|||
|
|||
diff --git a/ixml/inc/posix_overwrites.h b/ixml/inc/posix_overwrites.h
|
|||
index a9c49e3f..7e37a355 100644
|
|||
--- a/ixml/inc/posix_overwrites.h
|
|||
+++ b/ixml/inc/posix_overwrites.h
|
|||
@@ -11,11 +11,5 @@
|
|||
#define strncasecmp strnicmp |
|||
#define strnicmp _strnicmp |
|||
|
|||
- /* Secure versions of functions */
|
|||
- #define strcat(arg1, arg2) strcat_s(arg1, sizeof(arg1), arg2)
|
|||
- #define strcpy(arg1, arg2) strcpy_s(arg1, _countof(arg1), arg2)
|
|||
- #define strncpy(arg1, arg2, arg3) strncpy_s(arg1, arg3, arg2, arg3)
|
|||
- #define sprintf(arg1, ...) sprintf_s(arg1, sizeof(arg1), __VA_ARGS__)
|
|||
-
|
|||
#endif /* _WIN32 */ |
|||
#endif /* POSIX_OVERWRTIES_H */ |
|||
--
|
|||
2.35.1 |
|||
|
|||
Loading…
Reference in new issue