Fix build with -fno-common
|
|
Patch from https://src.fedoraproject.org/rpms/ncftp/raw/master/f/ncftp-3.2.5-gcc10.patch
|
|
Upstream-Status: Pending
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
--- a/ncftp/bookmark.h
|
+++ b/ncftp/bookmark.h
|
@@ -29,6 +29,8 @@ typedef struct Bookmark {
|
int reserved;
|
} Bookmark;
|
|
+extern Bookmark gBm;
|
+
|
#define kBookmarkVersion 8
|
#define kBookmarkMinVersion 3
|
#if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
|
--- a/ncftp/cmds.c
|
+++ b/ncftp/cmds.c
|
@@ -98,7 +98,7 @@ extern char gPager[], gHome[], gShell[];
|
extern char gOS[];
|
extern int gAutoResume;
|
extern int gAutoSaveChangesToExistingBookmarks;
|
-extern Bookmark gBm;
|
+//extern Bookmark gBm;
|
extern int gLoadedBm, gConfirmClose, gSavePasswords, gScreenColumns;
|
extern char gLocalCWD[512], gPrevLocalCWD[512];
|
extern int gMayCancelJmp;
|
--- a/ncftp/main.c
|
+++ b/ncftp/main.c
|
@@ -38,7 +38,7 @@ extern int gUnprocessedJobs;
|
char gLocalCWD[512], gPrevLocalCWD[512];
|
|
extern char gRemoteCWD[512], gPrevRemoteCWD[512];
|
-extern Bookmark gBm;
|
+//extern Bookmark gBm;
|
extern int gLoadedBm;
|
extern int gFirewallType;
|
extern char gAutoAscii[];
|
--- a/sh_util/gpshare.c
|
+++ b/sh_util/gpshare.c
|
@@ -28,7 +28,7 @@
|
|
static int gIsAtty1 = 1, gIsAtty2 = 1;
|
extern int gLoadedBm, gBookmarkMatchMode;
|
-Bookmark gBm;
|
+//Bookmark gBm;
|
|
double
|
FileSize(double size, const char **uStr0, double *uMult0)
|
--- a/sh_util/ncftpget.c
|
+++ b/sh_util/ncftpget.c
|
@@ -40,7 +40,7 @@ extern unsigned int gFirewallPort;
|
extern char gFirewallExceptionList[256];
|
extern int gFwDataPortMode;
|
extern const char gOS[], gVersion[];
|
-extern Bookmark gBm;
|
+//extern Bookmark gBm;
|
|
static void
|
#if (defined(__GNUC__)) && (__GNUC__ >= 2)
|
--- a/sh_util/ncftpls.c
|
+++ b/sh_util/ncftpls.c
|
@@ -39,7 +39,7 @@ extern unsigned int gFirewallPort;
|
extern char gFirewallExceptionList[256];
|
extern int gFwDataPortMode;
|
extern const char gOS[], gVersion[];
|
-extern Bookmark gBm;
|
+//extern Bookmark gBm;
|
|
static int FTPRemoteRecursiveMList(FTPCIPtr cip, const char *const rdir, /* FTPFileInfoListPtr files, */ FTPLineListPtr lines);
|
|
--- a/sh_util/ncftpput.c
|
+++ b/sh_util/ncftpput.c
|
@@ -41,7 +41,6 @@ extern unsigned int gFirewallPort;
|
extern char gFirewallExceptionList[256];
|
extern int gFwDataPortMode;
|
extern const char gOS[], gVersion[];
|
-extern Bookmark gBm;
|
extern int gSendfileInProgress;
|
|
static void
|