Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
330cedc7
Commit
330cedc7
authored
May 29, 2012
by
Konstantin Pavlov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: fix libupnp build under mingw32 with ipv6 enabled.
parent
d34619d3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
0 deletions
+50
-0
contrib/src/upnp/libupnp-ipv6.patch
contrib/src/upnp/libupnp-ipv6.patch
+49
-0
contrib/src/upnp/rules.mak
contrib/src/upnp/rules.mak
+1
-0
No files found.
contrib/src/upnp/libupnp-ipv6.patch
0 → 100644
View file @
330cedc7
From 438ace99538713fb1370411188e0f370069a1818 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@videolan.org>
Date: Tue, 29 May 2012 10:18:40 +0400
Subject: [PATCH] Fix compile under mingw with IPv6 enabled.
---
upnp/src/genlib/miniserver/miniserver.c | 7 +++++++
upnp/src/ssdp/ssdp_server.c | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/upnp/src/genlib/miniserver/miniserver.c b/upnp/src/genlib/miniserver/miniserver.c
index af310ca..1ae422f 100644
--- a/upnp/src/genlib/miniserver/miniserver.c
+++ b/upnp/src/genlib/miniserver/miniserver.c
@@ -68,6 +68,13 @@
/*! . */
#define APPLICATION_LISTENING_PORT 49152
+/* IPV6_V6ONLY is missing from MinGW, hack taken from
+ * http://svn.apache.org/repos/asf/apr/apr/trunk/network_io/win32/sockopt.c
+ */
+#ifndef IPV6_V6ONLY
+#define IPV6_V6ONLY 27
+#endif
+
struct mserv_request_t {
/*! Connection handle. */
SOCKET connfd;
diff --git a/upnp/src/ssdp/ssdp_server.c b/upnp/src/ssdp/ssdp_server.c
index 231c2c5..6a9c27f 100644
--- a/upnp/src/ssdp/ssdp_server.c
+++ b/upnp/src/ssdp/ssdp_server.c
@@ -69,6 +69,13 @@
#endif /* UPNP_ENABLE_IPV6 */
#endif /* INCLUDE_CLIENT_APIS */
+/* IPV6_V6ONLY is missing from MinGW, hack taken from
+ * http://svn.apache.org/repos/asf/apr/apr/trunk/network_io/win32/sockopt.c
+ */
+#ifndef IPV6_V6ONLY
+#define IPV6_V6ONLY 27
+#endif
+
void RequestHandler();
enum Listener {
--
1.7.9.7
contrib/src/upnp/rules.mak
View file @
330cedc7
...
@@ -21,6 +21,7 @@ ifdef HAVE_WIN32
...
@@ -21,6 +21,7 @@ ifdef HAVE_WIN32
$(APPLY)
$(SRC)
/upnp/libupnp-win32.patch
$(APPLY)
$(SRC)
/upnp/libupnp-win32.patch
$(APPLY)
$(SRC)
/upnp/libupnp-win64.patch
$(APPLY)
$(SRC)
/upnp/libupnp-win64.patch
endif
endif
$(APPLY)
$(SRC)
/upnp/libupnp-ipv6.patch
$(UPDATE_AUTOCONFIG)
&&
cd
$(UNPACK_DIR)
&&
mv
config.guess config.sub build-aux/
$(UPDATE_AUTOCONFIG)
&&
cd
$(UNPACK_DIR)
&&
mv
config.guess config.sub build-aux/
$(MOVE)
$(MOVE)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment