Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-01-25 22:10:35 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-02-09 17:12:36 (GMT) |
| commit | 4fa1338b324c5e11218cea29c474da42b9142651 (patch) | |
| tree | 2b3c68a0208ac9558abb7ab862c88a8a793891f2 /3rdParty/LibNATPMP/02_windows_compilation_fix.diff | |
| parent | 415e2a0e26af19e00b7cafb58be72909ae1d8212 (diff) | |
| download | swift-4fa1338b324c5e11218cea29c474da42b9142651.zip swift-4fa1338b324c5e11218cea29c474da42b9142651.tar.bz2 | |
Update libnatpmp to version of release 20140401
Additional fixes:
- applied our Android patch, as it has been applied before
- added and applied a new patch that disables getdefaultgateway()
dummy on the Windows platform
Test-Information:
Verified that it builds.
Change-Id: Id5ebbada26fadbaf3aff1135aa997c49d88c9d84
Diffstat (limited to '3rdParty/LibNATPMP/02_windows_compilation_fix.diff')
| -rw-r--r-- | 3rdParty/LibNATPMP/02_windows_compilation_fix.diff | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/3rdParty/LibNATPMP/02_windows_compilation_fix.diff b/3rdParty/LibNATPMP/02_windows_compilation_fix.diff new file mode 100644 index 0000000..388b8b0 --- /dev/null +++ b/3rdParty/LibNATPMP/02_windows_compilation_fix.diff @@ -0,0 +1,13 @@ +diff --git a/3rdParty/LibNATPMP/src/libnatpmp/getgateway.c b/3rdParty/LibNATPMP/src/libnatpmp/getgateway.c +index 45c6e6f..3a3f9a6 100644 +--- a/3rdParty/LibNATPMP/src/libnatpmp/getgateway.c ++++ b/3rdParty/LibNATPMP/src/libnatpmp/getgateway.c +@@ -67,7 +67,7 @@ POSSIBILITY OF SUCH DAMAGE. + #undef USE_SYSCTL_NET_ROUTE + #endif + +-#if !defined(USE_PROC_NET_ROUTE) && !defined(USE_SOCKET_ROUTE) && !defined(USE_SYSCTL_NET_ROUTE) ++#if !defined(USE_PROC_NET_ROUTE) && !defined(USE_SOCKET_ROUTE) && !defined(USE_SYSCTL_NET_ROUTE) && !defined(WIN32) + int getdefaultgateway(in_addr_t * addr) + { + return -1;
\ No newline at end of file |