From 7ce398cc23007d5721297329e6e942a3b2dec556 Mon Sep 17 00:00:00 2001 From: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com> Date: Mon, 11 May 2020 02:24:12 +0200 Subject: [PATCH] Fix the `multiple definitions` error. I don't know why it worked before like that.. but after updating devkitARM etc it seems to cause compilation issues. --- include/utils/ftp.h | 4 ++-- source/utils/ftp.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/utils/ftp.h b/include/utils/ftp.h index cafb236..4630aa2 100644 --- a/include/utils/ftp.h +++ b/include/utils/ftp.h @@ -10,8 +10,8 @@ typedef enum LOOP_EXIT, /*!< Terminate looping */ } loop_status_t; -bool isTransfering; -char ftp_accepted_connection[50], ftp_file_transfer[100]; +extern bool isTransfering; +extern char ftp_accepted_connection[50], ftp_file_transfer[100]; int ftp_init(void); loop_status_t ftp_loop(void); diff --git a/source/utils/ftp.c b/source/utils/ftp.c index 391b4ee..1ba5adc 100644 --- a/source/utils/ftp.c +++ b/source/utils/ftp.c @@ -33,6 +33,10 @@ #define BIT(x) (1<<(x)) #endif + +bool isTransfering; +char ftp_accepted_connection[50], ftp_file_transfer[100]; + #define POLL_UNKNOWN (~(POLLIN|POLLPRI|POLLOUT)) #define XFER_BUFFERSIZE 32768