Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-05-22 21:02:12 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-05-26 08:39:59 (GMT) |
| commit | 21a8ea1a4ced41b290e133805c6e19dad6f6b21c (patch) | |
| tree | 00e39da63b0c396f3643e29d4d6b0ae2623264d2 | |
| parent | d1823afd38df62887b0c5e9f1f01a50ab84f77ba (diff) | |
| download | swift-21a8ea1a4ced41b290e133805c6e19dad6f6b21c.zip swift-21a8ea1a4ced41b290e133805c6e19dad6f6b21c.tar.bz2 | |
Fix compilation on FreeBSD 10
Configuration for LibMiniUPNPc did not detect size of ip_mreqn
correctly.
Test-Information:
Tested on FreeBSD 10.
Change-Id: I5d91695b6ec2f1ad91e4fe6bf0e73876fef4fa8b
| -rw-r--r-- | 3rdParty/LibMiniUPnPc/SConscript | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/3rdParty/LibMiniUPnPc/SConscript b/3rdParty/LibMiniUPnPc/SConscript index ce2fe48..05eed8f 100644 --- a/3rdParty/LibMiniUPnPc/SConscript +++ b/3rdParty/LibMiniUPnPc/SConscript @@ -35,19 +35,20 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) : myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]]) myenv.Append(CCFLAGS = ["-DNDEBUG", "-DSTATICLIB"]) - + if myenv["PLATFORM"] != "win32": myenv.Append(CCFLAGS = ["-DMINIUPNPC_SET_SOCKET_TIMEOUT"]) - + myenv.Append(CCFLAGS = ["-D_BSD_SOURCE"]) + if myenv["PLATFORM"] == "darwin": myenv.Append(CCFLAGS = ["-DMACOSX", "-D_DARWIN_C_SOURCE"]) - + if myenv["PLATFORM"] == "win32": myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"]) if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin": conf = Configure(conf_env) - if conf.CheckTypeSize("ip_mreqn") == 0: + if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0: myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"]) conf.Finish() |