From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 26 Apr 2005 16:42:38 +0000 (+0000)
Subject: Remove posixver.h and its uses.
X-Git-Tag: CPPI-1_12~932
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f7612bc5ef991b303d8ae21a30732e31fb7099f;p=thirdparty%2Fcoreutils.git

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 869e4b8743..9cba88bf7d 100644
--- 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, "");