Applied, thank you.

On Tue, Aug 10, 2021 at 10:13 AM Ron Yorston <[email protected]> wrote:
>
> When long options were disabled cp failed to compile with:
>
> coreutils/cp.c:130:9: error: empty enum is invalid
>   130 |         };
>       |         ^
>
> Rearrange the conditional compilation to suit.
>
> Signed-off-by: Ron Yorston <[email protected]>
> ---
>  coreutils/cp.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/coreutils/cp.c b/coreutils/cp.c
> index 50ca1ccea..ee40af50b 100644
> --- a/coreutils/cp.c
> +++ b/coreutils/cp.c
> @@ -121,14 +121,12 @@ int cp_main(int argc, char **argv)
>         int d_flags;
>         int flags;
>         int status;
> -       enum {
>  #if ENABLE_FEATURE_CP_LONG_OPTIONS
> +       enum {
>                 /*OPT_rmdest  = FILEUTILS_RMDEST = 1 << FILEUTILS_CP_OPTBITS 
> */
>                 OPT_parents = 1 << (FILEUTILS_CP_OPTBITS+1),
>                 OPT_reflink = 1 << (FILEUTILS_CP_OPTBITS+2),
> -#endif
>         };
> -#if ENABLE_FEATURE_CP_LONG_OPTIONS
>  # if ENABLE_FEATURE_CP_REFLINK
>         char *reflink = NULL;
>  # endif
> --
> 2.31.1
>
> _______________________________________________
> busybox mailing list
> [email protected]
> http://lists.busybox.net/mailman/listinfo/busybox
_______________________________________________
busybox mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/busybox

Reply via email to