diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-06-23 01:19:23 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-09-17 16:48:47 +0200 |
| commit | 78949d668ea900726be9f491e9739d19bbe7f8c1 (patch) | |
| tree | 9828089a9de8671cdd75e8c71fec3d703c8e5074 | |
| parent | 6c8a84978725eb9efb06d4cf3e99c64f151e6c56 (diff) | |
Add getopt declarationscp-6.2-24
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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102924
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
| -rw-r--r-- | external/nss/UnpackedTarball_nss.mk | 1 | ||||
| -rw-r--r-- | external/nss/nss.getopt.patch.0 | 25 |
2 files changed, 26 insertions, 0 deletions
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; + |