| rjw | 1f88458 | 2022-01-06 17:20:42 +0800 | [diff] [blame^] | 1 | From 53496e2e306b16ac59801553f775bcca164e6a39 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> |
| 3 | Date: Wed, 14 Sep 2016 16:20:37 +0100 |
| 4 | Subject: [PATCH] fix gcc >= 4 compilation |
| 5 | |
| 6 | | ../gawk-3.1.5/hard-locale.h: In function 'hard_locale': |
| 7 | | ../gawk-3.1.5/hard-locale.h:43:20: error: invalid storage class for function 'xmalloc' |
| 8 | | static ptr_t xmalloc PARAMS ((size_t n)); |
| 9 | | ^~~~~~~ |
| 10 | |
| 11 | | ../gawk-3.1.5/hard-locale.h:45:22: warning: implicit declaration of function 'xmalloc' [-Wimplicit-function-declaration] |
| 12 | | char *locale = xmalloc (strlen (p) + 1); |
| 13 | | ^~~~~~~ |
| 14 | | ../gawk-3.1.5/hard-locale.h:45:22: warning: initialization makes pointer from integer without a cast [-Wint-conversion] |
| 15 | | ../gawk-3.1.5/dfa.c: At top level: |
| 16 | | ../gawk-3.1.5/dfa.c:125:14: error: conflicting types for 'xmalloc' |
| 17 | | static ptr_t xmalloc PARAMS ((size_t n)); |
| 18 | | ^~~~~~~ |
| 19 | | In file included from ../gawk-3.1.5/dfa.c:112:0: |
| 20 | | ../gawk-3.1.5/hard-locale.h:45:22: note: previous implicit declaration of 'xmalloc' was here |
| 21 | | char *locale = xmalloc (strlen (p) + 1); |
| 22 | | ^~~~~~~ |
| 23 | |
| 24 | Upstream-Status: Inappropriate [required for gawk 3.1.5 (GPLv2) recipe only] |
| 25 | |
| 26 | Signed-off-by: André Draszik <git@andred.net> |
| 27 | --- |
| 28 | dfa.c | 2 +- |
| 29 | hard-locale.h | 2 -- |
| 30 | 2 files changed, 1 insertion(+), 3 deletions(-) |
| 31 | |
| 32 | diff --git a/dfa.c b/dfa.c |
| 33 | index 71e3736..97f6045 100644 |
| 34 | --- a/dfa.c |
| 35 | +++ b/dfa.c |
| 36 | @@ -109,6 +109,7 @@ extern void free(); |
| 37 | |
| 38 | #include "regex.h" |
| 39 | #include "dfa.h" |
| 40 | +static ptr_t xmalloc PARAMS ((size_t n)); |
| 41 | #include "hard-locale.h" |
| 42 | |
| 43 | /* HPUX, define those as macros in sys/param.h */ |
| 44 | @@ -122,7 +123,6 @@ extern void free(); |
| 45 | static void dfamust PARAMS ((struct dfa *dfa)); |
| 46 | |
| 47 | static ptr_t xcalloc PARAMS ((size_t n, size_t s)); |
| 48 | -static ptr_t xmalloc PARAMS ((size_t n)); |
| 49 | static ptr_t xrealloc PARAMS ((ptr_t p, size_t n)); |
| 50 | #ifdef DEBUG |
| 51 | static void prtok PARAMS ((token t)); |
| 52 | diff --git a/hard-locale.h b/hard-locale.h |
| 53 | index 0f4986b..9ee57e0 100644 |
| 54 | --- a/hard-locale.h |
| 55 | +++ b/hard-locale.h |
| 56 | @@ -40,8 +40,6 @@ hard_locale (int category) |
| 57 | if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0) |
| 58 | hard = 0; |
| 59 | # else |
| 60 | - static ptr_t xmalloc PARAMS ((size_t n)); |
| 61 | - |
| 62 | char *locale = xmalloc (strlen (p) + 1); |
| 63 | strcpy (locale, p); |
| 64 | |
| 65 | -- |
| 66 | 2.9.3 |
| 67 | |