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/src/libnatpmp/natpmp.h | |
| 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/src/libnatpmp/natpmp.h')
| -rw-r--r-- | 3rdParty/LibNATPMP/src/libnatpmp/natpmp.h | 56 |
1 files changed, 35 insertions, 21 deletions
diff --git a/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h b/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h index c870371..6791c76 100644 --- a/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h +++ b/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h @@ -1,19 +1,31 @@ -/* $Id: natpmp.h,v 1.14 2011/01/03 17:31:03 nanard Exp $ */ +/* $Id: natpmp.h,v 1.19 2014/04/01 09:39:29 nanard Exp $ */ /* libnatpmp - * Copyright (c) 2007-2011, Thomas BERNARD <miniupnp@free.fr> - * http://miniupnp.free.fr/libnatpmp.html - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +Copyright (c) 2007-2013, Thomas BERNARD +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +*/ #ifndef __NATPMP_H__ #define __NATPMP_H__ @@ -23,21 +35,23 @@ #include <time.h> #if !defined(_MSC_VER) #include <sys/time.h> -#endif +#endif /* !defined(_MSC_VER) */ + #ifdef WIN32 #include <winsock2.h> #if !defined(_MSC_VER) || _MSC_VER >= 1600 #include <stdint.h> -#else +#else /* !defined(_MSC_VER) || _MSC_VER >= 1600 */ typedef unsigned long uint32_t; typedef unsigned short uint16_t; -#endif +#endif /* !defined(_MSC_VER) || _MSC_VER >= 1600 */ #define in_addr_t uint32_t #include "declspec.h" -#else -#define LIBSPEC +#else /* WIN32 */ #include <netinet/in.h> -#endif +#endif /* WIN32 */ + +#include "declspec.h" #ifdef ANDROID #include <arpa/inet.h> |