Remove posixver.h and its uses.

(short_options): New constant, which always supports -S[string].
(COMMON_SHORT_OPTIONS): Remove.

diff --git a/src/pr.c b/src/pr.c
index 869e4b874351f70340adf18be4cdb57d9fd475f3..9cba88bf7d1e7517315a499fa672a905555cfc63 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -319,7 +319,6 @@
 #include "hard-locale.h"
 #include "inttostr.h"
 #include "mbswidth.h"
-#include "posixver.h"
 #include "stdio-safer.h"
 #include "strftime.h"
 #include "xstrtol.h"
@@ -740,8 +739,8 @@ enum
   PAGES_OPTION
 };
 
-#define COMMON_SHORT_OPTIONS \
-       "-0123456789D:FJN:TW:abcde::fh:i::l:mn::o:rs::tvw:"
+static char const short_options[] =
+  "-0123456789D:FJN:S::TW:abcde::fh:i::l:mn::o:rs::tvw:";
 
 static struct option const long_options[] =
 {
@@ -869,10 +868,6 @@ main (int argc, char **argv)
   size_t n_digits = 0;
   size_t n_alloc = 0;
 
-  char const *short_options = (posix2_version () < 200112
-                              ? COMMON_SHORT_OPTIONS "S::"
-                              : COMMON_SHORT_OPTIONS "S:");
-
   initialize_main (&argc, &argv);
   program_name = argv[0];
   setlocale (LC_ALL, "");