summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-01-25 22:10:35 (GMT)
committerSwift Review <review@swift.im>2015-02-09 17:12:36 (GMT)
commit4fa1338b324c5e11218cea29c474da42b9142651 (patch)
tree2b3c68a0208ac9558abb7ab862c88a8a793891f2 /3rdParty/LibNATPMP/src/libnatpmp/declspec.h
parent415e2a0e26af19e00b7cafb58be72909ae1d8212 (diff)
downloadswift-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/declspec.h')
-rw-r--r--3rdParty/LibNATPMP/src/libnatpmp/declspec.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/3rdParty/LibNATPMP/src/libnatpmp/declspec.h b/3rdParty/LibNATPMP/src/libnatpmp/declspec.h
index ea479d1..a76be02 100644
--- a/3rdParty/LibNATPMP/src/libnatpmp/declspec.h
+++ b/3rdParty/LibNATPMP/src/libnatpmp/declspec.h
@@ -1,14 +1,20 @@
-#ifndef __DECLSPEC_H__
-#define __DECLSPEC_H__
+#ifndef DECLSPEC_H_INCLUDED
+#define DECLSPEC_H_INCLUDED
#if defined(WIN32) && !defined(STATICLIB)
+ /* for windows dll */
#ifdef NATPMP_EXPORTS
#define LIBSPEC __declspec(dllexport)
#else
#define LIBSPEC __declspec(dllimport)
#endif
#else
- #define LIBSPEC
+ #if defined(__GNUC__) && __GNUC__ >= 4
+ /* fix dynlib for OS X 10.9.2 and Apple LLVM version 5.0 */
+ #define LIBSPEC __attribute__ ((visibility ("default")))
+ #else
+ #define LIBSPEC
+ #endif
#endif
#endif