summaryrefslogtreecommitdiff
path: root/external/nss
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-06-23 01:19:23 +0300
committerTor Lillqvist <tml@collabora.com>2020-06-23 17:26:18 +0200
commit70848c7e5ab2035aa7727fa97492e4535fd6937e (patch)
treeb2ce0cf0b6c9599aecaee9edc5c7943080c50463 /external/nss
parentba86099d3c4804cc7e0958c9a89fbdee29456ecf (diff)
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 <tml@collabora.com>
Diffstat (limited to 'external/nss')
-rw-r--r--external/nss/UnpackedTarball_nss.mk1
-rw-r--r--external/nss/nss.getopt.patch.025
2 files changed, 26 insertions, 0 deletions
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index 8801c7cdad63..54119b9c2d9b 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/macos-dlopen.patch.0 \
external/nss/nss.nspr-parallel-win-debug_build.patch \
+ 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;
+