summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-05-07 09:04:51 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-05-07 09:04:51 +0200
commit2576addc283fa933e181727e84b70443615388ff (patch)
tree787d169f5c900cb834f626810d865e7bd1cc5ad6
parenta1905b8e7d79f36660df07d2d5355c154c146016 (diff)
parentf695de7c68e373088175f8f3b1650f11a27be7aa (diff)
downloadredot-engine-2576addc283fa933e181727e84b70443615388ff.tar.gz
Merge pull request #91636 from akien-mga/miniupnpc-disable-SET_SOCKET_TIMEOUT
miniupnpc: Disable socket timeout on Windows, matching upstream
-rw-r--r--modules/upnp/SCsub3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/upnp/SCsub b/modules/upnp/SCsub
index 4b385b820d..98c03e9ee9 100644
--- a/modules/upnp/SCsub
+++ b/modules/upnp/SCsub
@@ -30,7 +30,8 @@ if env["builtin_miniupnpc"]:
env_upnp.Prepend(CPPPATH=[thirdparty_dir + "include"])
env_upnp.Append(CPPDEFINES=["MINIUPNP_STATICLIB"])
- env_upnp.Append(CPPDEFINES=["MINIUPNPC_SET_SOCKET_TIMEOUT"])
+ if env["platform"] != "windows":
+ env_upnp.Append(CPPDEFINES=["MINIUPNPC_SET_SOCKET_TIMEOUT"])
env_thirdparty = env_upnp.Clone()
env_thirdparty.disable_warnings()