msginit: On native Windows, produce same PO header as on Unix.

* gettext-tools/src/msginit.c (plural_forms): Eliminate a trailing CR.

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index e9316aebd30d10d5bb49ccd9af45ea5735c43dae..f7c12dcc935105a486463253064b52c0274a5967 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -1409,7 +1409,13 @@ plural_forms ()
           goto failed;
         }
       if (linelen > 0 && line[linelen - 1] == '\n')
-        line[linelen - 1] = '\0';
+        {
+          line[linelen - 1] = '\0';
+#if defined _WIN32 && ! defined __CYGWIN__
+          if (linelen > 1 && line[linelen - 2] == '\r')
+            line[linelen - 2] = '\0';
+#endif
+        }
 
       fclose (fp);