From 5362d0c31b83fd7eb812f3215918504496c2f56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Wed, 29 Sep 2021 18:32:28 +0100 Subject: ws_getopt: Rename struct and macros This is part of the API and should also be renamed to avoid conflicts. --- mergecap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mergecap.c') diff --git a/mergecap.c b/mergecap.c index 0c5b3d768d..69147bd9c3 100644 --- a/mergecap.c +++ b/mergecap.c @@ -198,9 +198,9 @@ main(int argc, char *argv[]) cfile_close_failure_message }; int opt; - static const struct option long_options[] = { - {"help", no_argument, NULL, 'h'}, - {"version", no_argument, NULL, 'V'}, + static const struct ws_option long_options[] = { + {"help", ws_no_argument, NULL, 'h'}, + {"version", ws_no_argument, NULL, 'V'}, {0, 0, 0, 0 } }; gboolean do_append = FALSE; -- cgit v1.2.3