diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-05-31 07:56:09 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-05-31 11:33:19 +0000 |
| commit | dcba264a46f53e6f3be4d8f93fcf93d5d61668d1 (patch) | |
| tree | a7ec33fc2e34ec9f12588551bc9655ec58fd0d08 | |
| parent | 300458b24da557dc41dfe5154162b052b42e034d (diff) | |
| download | wireshark-dcba264a46f53e6f3be4d8f93fcf93d5d61668d1.tar.gz | |
lemon: avoid redundant redeclaration of ‘memory_error’ [-Wredundant-decls]
Change-Id: I1fbc11dc433363b659ddba9a77e52ffd4e3968d7
Reviewed-on: https://code.wireshark.org/review/21850
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | tools/lemon/lemon.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index e1101ae6d6..02dc201367 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -422,8 +422,8 @@ struct lemon { }; #define MemoryCheck(X) if((X)==0){ \ - extern void memory_error(void); \ - memory_error(); \ + fprintf(stderr,"Out of memory. Aborting...\n"); \ + exit(1); \ } /**************** From the file "table.h" *********************************/ @@ -1516,10 +1516,6 @@ make_basename(char* fullname) /* Report an out-of-memory condition and abort. This function ** is used mostly by the "MemoryCheck" macro in struct.h */ -extern void memory_error(void){ - fprintf(stderr,"Out of memory. Aborting...\n"); - exit(1); -} static int nDefine = 0; /* Number of -D options on the command line */ static char **azDefine = 0; /* Name of the -D macros */ |