diff options
author | Tobias Markmann <tm@ayena.de> | 2017-05-16 15:26:38 (GMT) |
---|---|---|
committer | Kevin Smith <kevin.smith@isode.com> | 2017-05-17 08:04:04 (GMT) |
commit | c2abb2e8c248bb57c7478606f941223322983a8e (patch) | |
tree | d4c0f39c2933bcf4e3fb96230da60b09d9aabfdd /3rdParty/LibNATPMP/src/libnatpmp/natpmp.h | |
parent | edf519a67a28f9acb61af6d442d94f1aa43df688 (diff) | |
download | swift-c2abb2e8c248bb57c7478606f941223322983a8e.zip swift-c2abb2e8c248bb57c7478606f941223322983a8e.tar.bz2 |
Update 3rdParty/LibNATPMP to libnatpmp-20150609
Furthermore applied current patches.
Test-Information:
Builds on macOS 10.12.5 with Qt 5.4.2 and all unit and
integration tests pass.
Change-Id: I7a8a3b7e8b37b20532e3ed5fe32f1cef5b09b1f6
Diffstat (limited to '3rdParty/LibNATPMP/src/libnatpmp/natpmp.h')
-rw-r--r-- | 3rdParty/LibNATPMP/src/libnatpmp/natpmp.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h b/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h index 6791c76..41325c9 100644 --- a/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h +++ b/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h @@ -1,6 +1,6 @@ -/* $Id: natpmp.h,v 1.19 2014/04/01 09:39:29 nanard Exp $ */ +/* $Id: natpmp.h,v 1.20 2014/04/22 09:15:40 nanard Exp $ */ /* libnatpmp -Copyright (c) 2007-2013, Thomas BERNARD +Copyright (c) 2007-2014, Thomas BERNARD All rights reserved. Redistribution and use in source and binary forms, with or without @@ -48,10 +48,18 @@ typedef unsigned short uint16_t; #define in_addr_t uint32_t #include "declspec.h" #else /* WIN32 */ +#define LIBSPEC #include <netinet/in.h> #endif /* WIN32 */ -#include "declspec.h" +/* causes problem when installing. Maybe should it be inlined ? */ +/* #include "declspec.h" */ + +#ifdef ANDROID +#include <arpa/inet.h> +#define in_addr_t uint32_t +#endif + #ifdef ANDROID #include <arpa/inet.h> |