| From a4a48baf86b18b792fb5e53648b4efd02b3db7b7 Mon Sep 17 00:00:00 2001 |
| From: Vasiliy Glazov <vascom2@gmail.com> |
| Date: Sun, 8 Mar 2020 03:00:21 +0300 |
| Subject: [PATCH] Fix build with GCC 10. |
| |
| [Retrieved (and backported) from: |
| https://github.com/Motion-Project/motion/commit/a4a48baf86b18b792fb5e53648b4efd02b3db7b7] |
| Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| --- |
| src/netcam.h | 2 +- |
| src/translate.c | 2 ++ |
| src/translate.h | 2 +- |
| 3 files changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/netcam.h b/netcam.h |
| index 2951d917..4ee0e1c8 100644 |
| --- a/netcam.h |
| +++ b/netcam.h |
| @@ -113,7 +113,7 @@ typedef struct netcam_image_buff { |
| } netcam_buff; |
| typedef netcam_buff *netcam_buff_ptr; |
| |
| -struct netcam_caps { /* netcam capabilities: */ |
| +extern struct netcam_caps { /* netcam capabilities: */ |
| unsigned char streaming; /* See the NCS_* defines */ |
| unsigned char content_length; /* 0 - unsupported */ |
| } caps; |
| diff --git a/translate.c b/translate.c |
| index 0c9f1105..a212d9de 100644 |
| --- a/translate.c |
| +++ b/translate.c |
| @@ -10,6 +10,8 @@ |
| #include "motion.h" |
| #include "translate.h" |
| |
| +int nls_enabled; |
| + |
| void translate_locale_chg(const char *langcd){ |
| #ifdef HAVE_GETTEXT |
| /* This routine is for development testing only. It is not used for |
| diff --git a/translate.h b/translate.h |
| index 0832ffd8..eeba3745 100644 |
| --- a/translate.h |
| +++ b/translate.h |
| @@ -10,7 +10,7 @@ |
| #ifndef _INCLUDE_TRANSLATE_H_ |
| #define _INCLUDE_TRANSLATE_H_ |
| |
| -int nls_enabled; |
| +extern int nls_enabled; |
| |
| #ifdef HAVE_GETTEXT |
| # include <libintl.h> |