Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / intl / gmo.h

diff --git a/intl/gmo.h b/intl/gmo.h
index da9dbaa9caf5341925a9c2eeb16205339b69a87c..e7c9cc14b5d6d556559f6ea54259b1640c48f79d 100644 (file)
--- a/intl/gmo.h
+++ b/intl/gmo.h
@@ -1,5 +1,5 @@
 /* Description of GNU message catalog format: general file layout.
-   Copyright (C) 1995, 1997, 2000-2002, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000-2002, 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
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.  */
 
 #ifndef _GETTEXT_H
@@ -124,15 +124,6 @@ struct sysdep_segment
   nls_uint32 offset;
 };
 
-/* Pair of a static and a system dependent segment, in struct sysdep_string.  */
-struct segment_pair
-{
-  /* Size of static segment.  */
-  nls_uint32 segsize;
-  /* Reference to system dependent string segment, or ~0 at the end.  */
-  nls_uint32 sysdepref;
-};
-
 /* Descriptor for system dependent string.  */
 struct sysdep_string
 {
@@ -140,7 +131,13 @@ struct sysdep_string
   nls_uint32 offset;
   /* Alternating sequence of static and system dependent segments.
      The last segment is a static segment, including the trailing NUL.  */
-  struct segment_pair segments[1];
+  struct segment_pair
+  {
+    /* Size of static segment.  */
+    nls_uint32 segsize;
+    /* Reference to system dependent string segment, or ~0 at the end.  */
+    nls_uint32 sysdepref;
+  } segments[1];
 };
 
 /* Marker for the end of the segments[] array.  This has the value 0xFFFFFFFF,