Fix double definition of a variable, add extern.

svn path=/trunk/; revision=43571

reactos/base/applications/network/ftp/ftp.c

@@ -1136,13 +1136,6 @@ null();//		(void) signal(SIGINT,oldintr);
 null();//	(void) signal(SIGINT,oldintr);
 }
 
-/*
- * Need to start a listen on the data channel
- * before we send the command, otherwise the
- * server's connect may fail.
- */
-int sendport = -1;
-
 int
 initconn()
 {

reactos/base/applications/network/ftp/ftp_var.h

@@ -150,9 +150,9 @@ struct macel {
 	char *mac_end;			/* end of macro in macbuf */
 };
 
-int macnum;			/* number of defined macros */
-struct macel macros[16];
-char macbuf[4096];
+extern int macnum;			/* number of defined macros */
+extern struct macel macros[16];
+extern char macbuf[4096];
 
 #if	defined(__ANSI__) || defined(sparc)
 typedef void sig_t;

reactos/base/applications/network/ftp/main.c

@@ -72,7 +72,7 @@ int     autologin;
  */
 int	trace;			/* trace packets exchanged */
 int	hash;			/* print # for each buffer transferred */
-int	sendport;		/* use PORT cmd for each data connection */
+//int	sendport;		/* use PORT cmd for each data connection */
 int	verbose;		/* print messages coming back from server */
 int	connected;		/* connected to server */
 int	fromatty;		/* input is from a terminal */
@@ -121,6 +121,17 @@ int	mflag;			/* flag: if != 0, then active multi command */
 
 int	options;		/* used during socket creation */
 
+int	macnum;			/* number of defined macros */
+struct	macel macros[16];
+char	macbuf[4096];
+
+/* 
+ * Need to start a listen on the data channel 
+ * before we send the command, otherwise the 
+ * server's connect may fail. 
+ */
+int sendport = -1;
+
 static const char *slurpstring();