From f3b92d385695aecefd93d5f199be1f64270c2687 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 19 Jun 2009 12:10:38 +0200 Subject: getopt: FEATURE_GETOPT_LONG for -l; rename GETOPT_LONG to LONG_OPTS Signed-off-by: Colin Watson Signed-off-by: Denys Vlasenko --- coreutils/od_bloaty.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'coreutils/od_bloaty.c') diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index eb4579857..00efec51c 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c @@ -832,7 +832,7 @@ format_address_std(off_t address, char c) printf(address_fmt, address); } -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS /* only used with --traditional */ static void format_address_paren(off_t address, char c) @@ -953,7 +953,7 @@ get_lcm(void) return l_c_m; } -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS /* If S is a valid traditional offset specification with an optional leading '+' return nonzero and set *OFFSET to the offset it denotes. */ @@ -1199,9 +1199,9 @@ int od_main(int argc, char **argv) OPT_s = 1 << 15, OPT_S = 1 << 16, OPT_w = 1 << 17, - OPT_traditional = (1 << 18) * ENABLE_GETOPT_LONG, + OPT_traditional = (1 << 18) * ENABLE_LONG_OPTS, }; -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS static const char od_longopts[] ALIGN1 = "skip-bytes\0" Required_argument "j" "address-radix\0" Required_argument "A" @@ -1235,7 +1235,7 @@ int od_main(int argc, char **argv) /* Parse command line */ opt_complementary = "w+:t::"; /* -w N, -t is a list */ -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS applet_long_options = od_longopts; #endif opt = getopt32(argv, "A:N:abcdfhij:lot:vxsS:" @@ -1306,7 +1306,7 @@ int od_main(int argc, char **argv) * FIXME: POSIX 1003.1-2001 with XSI requires support for the * traditional syntax even if --traditional is not given. */ -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS if (opt & OPT_traditional) { off_t o1, o2; -- cgit v1.2.3