Fix the __GNU_GETTEXT_SUPPORTED_REVISION macro.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index b6c3c03ee51aabfc2d6ce59515ac1a94d1d06246..4771fbadaf143eb7ad33c0eebbaac2a44bd04144 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-13  Bruno Haible  <bruno@clisp.org>
+
+       * libgnuintl.h.in (__GNU_GETTEXT_SUPPORTED_REVISION): Treat major
+       revision 1 like major revision 0. Needed for 2004-01-09 change.
+
 2004-08-08  Bruno Haible  <bruno@clisp.org>
 
        * relocatable.c (FILE_SYSTEM_PREFIX_LEN): Renamed from

diff --git a/gettext-runtime/intl/libgnuintl.h.in b/gettext-runtime/intl/libgnuintl.h.in
index 3be7eb990cb6ce599568d90ed7c5ae5aaa721488..afc21dad42d104391e7280902e5c11c849939681 100644 (file)
--- a/gettext-runtime/intl/libgnuintl.h.in
+++ b/gettext-runtime/intl/libgnuintl.h.in
@@ -1,5 +1,5 @@
 /* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -39,7 +39,7 @@
 /* Provide information about the supported file formats.  Returns the
    maximum minor revision number supported for a given major revision.  */
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-  ((major) == 0 ? 1 : -1)
+  ((major) == 0 || (major) == 1 ? 1 : -1)
 
 /* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
    precedence over _conio_gettext.  */