diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-08-29 02:25:38 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-08-29 02:25:38 +0000 |
| commit | 0111d3702bd6742b9f6fe6eeee6fce7c6e6ceb8a (patch) | |
| tree | 61a40a42539d82af90a3c6410539fbc7c754df6c /games | |
| parent | 8de69798f4e7927311990367f29217cbef93c2b1 (diff) | |
| download | ports-0111d3702bd6742b9f6fe6eeee6fce7c6e6ceb8a.tar.gz ports-0111d3702bd6742b9f6fe6eeee6fce7c6e6ceb8a.zip | |
MFH: r546865
games/megaglest: fix build with LLVM 11
The fallout here is due to the new -fno-common default in GCC 10 / LLVM 11.
PR: 248870
Obtained from: https://github.com/MegaGlest/megaglest-source/issues/197
Approved by: ports-secteam (-fno-common build fix)
Notes
Notes:
svn path=/branches/2020Q3/; revision=546867
Diffstat (limited to 'games')
| -rw-r--r-- | games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h | 28 | ||||
| -rw-r--r-- | games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c | 16 |
2 files changed, 44 insertions, 0 deletions
diff --git a/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h b/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h new file mode 100644 index 000000000000..0cac2d24ad30 --- /dev/null +++ b/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h @@ -0,0 +1,28 @@ +--- source/shared_lib/include/feathery_ftp/ftpTypes.h.orig 2020-08-25 07:39:46 UTC ++++ source/shared_lib/include/feathery_ftp/ftpTypes.h +@@ -69,7 +69,7 @@ typedef uint16_t port_t; + extern "C" { + #endif + +-int VERBOSE_MODE_ENABLED; ++extern int VERBOSE_MODE_ENABLED; + + typedef ip_t (*ftpFindExternalFTPServerIpType)(ip_t clientIp); + typedef void (*ftpAddUPNPPortForwardType)(int internalPort, int externalPort); +@@ -77,11 +77,11 @@ typedef void (*ftpRemoveUPNPPortForwardType)(int inter + typedef int (*ftpIsValidClientType)(ip_t clientIp); + typedef int (*ftpIsClientAllowedToGetFileType)(ip_t clientIp, const char *username, const char *filename); + +-ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; +-ftpAddUPNPPortForwardType ftpAddUPNPPortForward; +-ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; +-ftpIsValidClientType ftpIsValidClient; +-ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; ++extern ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; ++extern ftpAddUPNPPortForwardType ftpAddUPNPPortForward; ++extern ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; ++extern ftpIsValidClientType ftpIsValidClient; ++extern ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; + + #ifdef __cplusplus + } diff --git a/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c b/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c new file mode 100644 index 000000000000..68a8c24bb3ad --- /dev/null +++ b/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c @@ -0,0 +1,16 @@ +--- source/shared_lib/sources/feathery_ftp/ftpRuntime.c.orig 2020-08-25 07:57:08 UTC ++++ source/shared_lib/sources/feathery_ftp/ftpRuntime.c +@@ -30,6 +30,13 @@ + #include "ftp.h" + #include "ftpMessages.h" + ++int VERBOSE_MODE_ENABLED; ++ ++ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; ++ftpAddUPNPPortForwardType ftpAddUPNPPortForward; ++ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; ++ftpIsValidClientType ftpIsValidClient; ++ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; + + /** + * @brief server-sockets that listens for incoming connections |