From 995aad77a51ffa35223bac858e8afdf1e46e69d3 Mon Sep 17 00:00:00 2001 From: midipix Date: Mon, 22 Jan 2024 04:15:39 +0000 Subject: driver: ar mode: preliminar argv parsing: avoid TAG enum member ambiguity. --- src/internal/slibtool_ar_impl.h | 6 ------ src/internal/slibtool_driver_impl.h | 4 ++++ src/skin/slbt_skin_ar.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/internal/slibtool_ar_impl.h b/src/internal/slibtool_ar_impl.h index 18d1ba2..70af6c5 100644 --- a/src/internal/slibtool_ar_impl.h +++ b/src/internal/slibtool_ar_impl.h @@ -7,12 +7,6 @@ extern const struct argv_option slbt_ar_options[]; -enum ar_tags { - TAG_AR_HELP, - TAG_AR_VERSION, - TAG_AR_CHECK, -}; - struct ar_armaps_impl { struct ar_raw_armap_bsd_32 armap_bsd_32; struct ar_raw_armap_bsd_64 armap_bsd_64; diff --git a/src/internal/slibtool_driver_impl.h b/src/internal/slibtool_driver_impl.h index 388e1cf..9aca3f6 100644 --- a/src/internal/slibtool_driver_impl.h +++ b/src/internal/slibtool_driver_impl.h @@ -81,6 +81,10 @@ enum app_tags { TAG_VERBATIM_FLAG, TAG_THREAD_SAFE, TAG_WEAK, + /* ar mode */ + TAG_AR_HELP, + TAG_AR_VERSION, + TAG_AR_CHECK, }; struct slbt_split_vector { diff --git a/src/skin/slbt_skin_ar.c b/src/skin/slbt_skin_ar.c index 6adfe6b..0c021d9 100644 --- a/src/skin/slbt_skin_ar.c +++ b/src/skin/slbt_skin_ar.c @@ -1,4 +1,4 @@ -#include "slibtool_ar_impl.h" +#include "slibtool_driver_impl.h" #include "argv/argv.h" const struct argv_option slbt_ar_options[] = { -- cgit v1.2.3