external/nss/UnpackedTarball_nss.mk | 1 + external/nss/nss.getopt.patch.0 | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+)
New commits: commit fe15bdc86aa759096c4581401f0e361e576416aa Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Tue Jun 23 01:19:23 2020 +0300 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Fri Sep 18 00:38:59 2020 +0200 Add getopt declarations Avoids: implicit declaration of function 'getopt' is invalid in C99 [-Werror,-Wimplicit-function-declaration]. Change-Id: Ic178f53d1002425df52e220b1723fb12edca13df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96910 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <t...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102924 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102977 diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 8fa1edd530cc..b6fcd1346b82 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.bzmozilla1238154.patch \ external/nss/nss-bz1646594.patch.1 \ external/nss/macos-dlopen.patch.0 \ + external/nss/nss.getopt.patch.0 \ $(if $(filter iOS,$(OS)), \ external/nss/nss-ios.patch) \ $(if $(filter ANDROID,$(OS)), \ diff --git a/external/nss/nss.getopt.patch.0 b/external/nss/nss.getopt.patch.0 new file mode 100644 index 000000000000..aeabb33f9b97 --- /dev/null +++ b/external/nss/nss.getopt.patch.0 @@ -0,0 +1,25 @@ +# pr/tests/sel_spd.c:427:20: error: implicit declaration of function 'getopt' is invalid in C99 [-Werror,-Wimplicit-function-declaration] +--- nspr/pr/tests/sel_spd.c ++++ nspr/pr/tests/sel_spd.c +@@ -15,6 +15,9 @@ + #include <stdio.h> + #include <errno.h> + #include <string.h> ++ ++extern char *optarg; ++int getopt(int argc, char *const argv[], const char *optstring); + + #ifdef DEBUG + #define PORT_INC_DO +100 +--- nspr/pr/tests/testfile.c ++++ nspr/pr/tests/testfile.c +@@ -23,6 +23,9 @@ + #include <getopt.h> + #include <errno.h> + #endif /* XP_OS2 */ ++ ++extern char *optarg; ++int getopt(int argc, char *const argv[], const char *optstring); + + static int _debug_on = 0; + _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits