Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / catgets / catgetsinfo.h

diff --git a/catgets/catgetsinfo.h b/catgets/catgetsinfo.h
index d40b4193f37666b68b4d5b211938f6657377526e..e48692750b20cb206125d9637580d5acc0db0d04 100644 (file)
--- a/catgets/catgetsinfo.h
+++ b/catgets/catgetsinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
 
@@ -13,12 +13,10 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <sys/types.h>
-#include <bits/libc-lock.h>
 
 
 struct catalog_obj
@@ -35,11 +33,7 @@ struct catalog_obj
 /* This structure will be filled after loading the catalog.  */
 typedef struct catalog_info
 {
-  enum { closed, nonexisting, mmapped, malloced } status;
-
-  const char *cat_name;
-  const char *env_var;
-  const char *nlspath;
+  enum { mmapped, malloced } status;
 
   size_t plane_size;
   size_t plane_depth;
@@ -48,15 +42,15 @@ typedef struct catalog_info
 
   struct catalog_obj *file_ptr;
   size_t file_size;
-
-  __libc_lock_define (,lock);
 } *__nl_catd;
 
 
 
 /* The magic number to signal we really have a catalog file.  */
-#define CATGETS_MAGIC 0x960408de
+#define CATGETS_MAGIC 0x960408deU
 
 
 /* Prototypes for helper functions.  */
-void __open_catalog (__nl_catd __catalog);
+extern int __open_catalog (const char *cat_name, const char *nlspath,
+                          const char *env_var, __nl_catd __catalog);
+libc_hidden_proto (__open_catalog)