Remove pre-Vista considerations from utilities

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

1 files changed, 4 insertions, 15 deletions

diff --git a/winsup/utils/locale.cc b/winsup/utils/locale.cc
index 1a5b50958..1d55d346e 100644
--- a/winsup/utils/locale.cc
+++ b/winsup/utils/locale.cc
@@ -322,15 +322,6 @@ print_all_locales (int verbose)
 		  wcscpy (loc_list[lcnt].country, country);
 		}
 	      c = stpcpy (loc, name);
-	      /* Convert old sr_SP silently to sr_CS on old systems.
-		 Make sure sr_CS country is in recent shape. */
-	      if (lang == LANG_SERBIAN
-		  && (sublang == SUBLANG_SERBIAN_LATIN
-		      || sublang == SUBLANG_SERBIAN_CYRILLIC))
-		{
-		  c = stpcpy (loc, "sr_CS");
-		  wcscpy (country, L"Serbia and Montenegro (Former)");
-		}
 	      /* Now check certain conditions to figure out if that
 		 locale requires a modifier. */
 	      if (lang == LANG_SERBIAN && !strncmp (loc, "sr_", 3)
@@ -377,12 +368,10 @@ print_all_locales (int verbose)
 	      add_locale (loc, language, country);
 	    }
 	}
-      /* Check Serbian language for the available territories.  Up to
-	 Server 2003 we only had sr_SP (silently converted to sr_CS
-	 above), in Vista we had only sr_CS.  First starting with W7 we
-	 have the actual sr_RS and sr_ME.  However, all of them are
-	 supported on all systems in Cygwin.  So we fake them here, if
-	 they are missing. */
+      /* Check Serbian language for the available territories.  Vista only
+	 had sr_CS.  Only starting with W7 we have the actual sr_RS and sr_ME.
+	 However, they are supported on Vista as well in Cygwin.  So we fake
+	 them here, if they are missing. */
       if (lang == LANG_SERBIAN)
 	{
 	  int sr_CS_idx = -1;