Swiftdiff options
Diffstat (limited to '3rdParty/LibNATPMP')
| -rw-r--r-- | 3rdParty/LibNATPMP/01_android_compilation_fix.diff | 34 | ||||
| -rw-r--r-- | 3rdParty/LibNATPMP/SConscript | 4 | ||||
| -rw-r--r-- | 3rdParty/LibNATPMP/src/libnatpmp/getgateway.h | 5 | ||||
| -rw-r--r-- | 3rdParty/LibNATPMP/src/libnatpmp/natpmp.h | 6 |
4 files changed, 47 insertions, 2 deletions
diff --git a/3rdParty/LibNATPMP/01_android_compilation_fix.diff b/3rdParty/LibNATPMP/01_android_compilation_fix.diff new file mode 100644 index 0000000..78943aa --- /dev/null +++ b/3rdParty/LibNATPMP/01_android_compilation_fix.diff @@ -0,0 +1,34 @@ +diff --git a/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h b/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h +index 9432528..51dadb7 100644 +--- a/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h ++++ b/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h +@@ -27,6 +27,11 @@ typedef unsigned short uint16_t; + #endif + #include "declspec.h" + ++#ifdef ANDROID ++#include <arpa/inet.h> ++#define in_addr_t uint32_t ++#endif ++ + /* getdefaultgateway() : + * return value : + * 0 : success +diff --git a/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h b/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h +index 1175b58..c870371 100644 +--- a/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h ++++ b/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h +@@ -39,6 +39,12 @@ typedef unsigned short uint16_t; + #include <netinet/in.h> + #endif + ++#ifdef ANDROID ++#include <arpa/inet.h> ++#define in_addr_t uint32_t ++#endif ++ ++ + typedef struct { + int s; /* socket */ + in_addr_t gateway; /* default gateway (IPv4) */ +--
\ No newline at end of file diff --git a/3rdParty/LibNATPMP/SConscript b/3rdParty/LibNATPMP/SConscript index 2cf745a..5d08698 100644 --- a/3rdParty/LibNATPMP/SConscript +++ b/3rdParty/LibNATPMP/SConscript @@ -8,8 +8,8 @@ if env.get("LIBNATPMP_BUNDLED", False) : if env["SCONS_STAGE"] == "flags" : + env["HAVE_LIBNATPMP"] = True env["LIBNATPMP_FLAGS"] = { "CPPPATH": [Dir("src/libnatpmp")], "LIBPATH": [Dir(".")], - "LIBS": ["Swiften_NATPMP"], "INTERNAL_CPPDEFINES": ["STATICLIB"], } @@ -49,3 +49,3 @@ if env.get("LIBNATPMP_BUNDLED", False) : src_files += ["src/libnatpmp/wingettimeofday.c"] - myenv.StaticLibrary("Swiften_NATPMP", src_files) + env["LIBNATPMP_OBJECTS"] = myenv.SwiftenObject(src_files) diff --git a/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h b/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h index 9432528..51dadb7 100644 --- a/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h +++ b/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h @@ -28,4 +28,9 @@ typedef unsigned short uint16_t; #include "declspec.h" +#ifdef ANDROID +#include <arpa/inet.h> +#define in_addr_t uint32_t +#endif + /* getdefaultgateway() : * return value : diff --git a/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h b/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h index 1175b58..c870371 100644 --- a/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h +++ b/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h @@ -40,4 +40,10 @@ typedef unsigned short uint16_t; #endif +#ifdef ANDROID +#include <arpa/inet.h> +#define in_addr_t uint32_t +#endif + + typedef struct { int s; /* socket */ |