Libc-763.11.tar.gz

[apple/libc.git] / nls / FreeBSD / msgcat.h

diff --git a/nls/FreeBSD/msgcat.h b/nls/FreeBSD/msgcat.h
index df2bf5a8780d36b30abc62dc337d1317b5785ceb..0a8b7883d49a0b287452022f47e12bc30fb1ecbf 100644 (file)
--- a/nls/FreeBSD/msgcat.h
+++ b/nls/FreeBSD/msgcat.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libc/nls/msgcat.h,v 1.8 2000/09/03 21:05:10 ache Exp $ */
+/* $FreeBSD: src/lib/libc/nls/msgcat.h,v 1.9 2005/02/01 16:04:55 phantom Exp $ */
 
 #ifndef _MSGCAT_H_
 #define _MSGCAT_H_
@@ -36,27 +36,20 @@ up-to-date.  Many thanks.
 
 ******************************************************************/
 
-
-#include <sys/types.h>
-
 /*
- * On disk data structures
+ * Magic definitions
  */
 
-/* For or'd constants */
-#define MCMakeId(s,m)          (unsigned long) ( ((unsigned short)s << (sizeof(short)*8)) \
-                                                | (unsigned short)m )
-#define MCSetId(id)            (unsigned int) ( id >> (sizeof(short) * 8) )
-#define MCMsgId(id)            (unsigned int) ( (id << (sizeof(short) * 8)) \
-                                               >> (sizeof(short) * 8) )
 #define MCMagicLen     8
 #define MCMagic                "*nazgul*"
-#define MCLastMsg      0
-#define MCLastSet      0
 
 #define MCMajorVer     1L
 #define MCMinorVer     0
 
+/* For or'd constants */
+#define MCMakeId(s,m)          (unsigned long) ( ((unsigned short)s << (sizeof(short)*8)) \
+                                                | (unsigned short)m )
+
 /*
  * Critical note here.  Sets and Messages *MUST* be stored in ascending
  * order.  There are stored that way (by specification) in the original
@@ -84,11 +77,6 @@ up-to-date.  Many thanks.
  * no guarantee that this will all work.
  */
 
-/* These should be publicly available */
-
-#define MCLoadBySet    0       /* Load entire sets as they are used */
-#define MCLoadAll      1       /* Load entire DB on catopen */
-
 /*
  * MCOffsetT - Union to handle both disk and runtime pointers
  */
@@ -129,7 +117,6 @@ typedef struct _MCSetT {
  * MCCatT - Runtime catalog pointer
  */
 typedef struct {
-    long       loadType;       /* How to load the messages (see MSLoadType) */
     FILE        *fp;            /* File descriptor of catalog (if load-on-demand) */
     long       numSets;        /* Number of sets */
     MCSetT     *sets;          /* Pointer to the sets */