summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-04-26 16:42:26 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-04-26 16:42:26 +0000
commitd6ac4446c44ffca01c6bb5e92d538dba54551e0b (patch)
tree606ec740f627ae27832c655d4525b94942182db1 /src
parentc6318338140fe1b5ce7682bf6b04121866fd0d0e (diff)
downloadcoreutils-d6ac4446c44ffca01c6bb5e92d538dba54551e0b.tar.xz
Remove posixver.h and its uses.
(short_options): New constant, which always supports -w[num]. (COMMON_SHORT_OPTIONS): Remove.
Diffstat (limited to 'src')
-rw-r--r--src/od.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/od.c b/src/od.c
index b55e7d3eb..50fa7405a 100644
--- a/src/od.c
+++ b/src/od.c
@@ -25,7 +25,6 @@
#include <sys/types.h>
#include "system.h"
#include "error.h"
-#include "posixver.h"
#include "quote.h"
#include "xstrtol.h"
@@ -262,7 +261,7 @@ static enum size_spec integral_type_size[MAX_INTEGRAL_TYPE_SIZE + 1];
#define MAX_FP_TYPE_SIZE sizeof (LONG_DOUBLE)
static enum size_spec fp_type_size[MAX_FP_TYPE_SIZE + 1];
-#define COMMON_SHORT_OPTIONS "A:aBbcDdeFfHhIij:LlN:OoS:st:vXx"
+static char const short_options[] = "A:aBbcDdeFfHhIij:LlN:OoS:st:vw::Xx";
/* For long options that have no equivalent short option, use a
non-character as a pseudo short option, starting with CHAR_MAX + 1. */
@@ -1550,9 +1549,6 @@ main (int argc, char **argv)
bool modern = false;
bool width_specified = false;
bool ok = true;
- char const *short_options = (posix2_version () < 200112
- ? COMMON_SHORT_OPTIONS "w::"
- : COMMON_SHORT_OPTIONS "w:");
/* The old-style `pseudo starting address' to be printed in parentheses
after any true address. */