diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-02-24 18:56:52 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-02-24 19:22:08 +0000 |
| commit | 42cf565b50badec2b23e0a38bfff3749448ac98f (patch) | |
| tree | 6a658791ce4b91165e71f85b863267b1c47abc33 /epan/dtd_preparse.l | |
| parent | e1282f28751fefc437280b4cb8b2e1b5df016752 (diff) | |
dtd: fix build due to -Wtypedef-redefinition
dtd.h defines the type, so avoid redefining to avoid this warning:
epan/dtd_preparse.l:113:3: warning: redefinition of typedef 'Dtd_PreParse_scanner_state_t' is a C11 feature [-Wtypedef-redefinition]
Change-Id: Id6dddb8fe082717b483a6eeae08dfde468c19c89
Fixes: v2.3.0rc0-2505-ge1282f2875 ("dtd: free memory on shutdown.")
Reviewed-on: https://code.wireshark.org/review/20266
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dtd_preparse.l')
| -rw-r--r-- | epan/dtd_preparse.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l index 9a4137736b..a3d169849f 100644 --- a/epan/dtd_preparse.l +++ b/epan/dtd_preparse.l @@ -99,7 +99,7 @@ #define ECHO g_string_append(yyextra->current,yytext); -typedef struct _dtd_preparse_scanner_state { +struct _dtd_preparse_scanner_state { const gchar* dtd_dirname; const gchar* filename; guint linenum; @@ -110,7 +110,7 @@ typedef struct _dtd_preparse_scanner_state { GString* current; GString* output; gchar* entity_name; -} Dtd_PreParse_scanner_state_t; +}; static const gchar* replace_entity(Dtd_PreParse_scanner_state_t* state, gchar* s); |