Cleanup prototypes and remove dead code

MFC After:      3 days

1 files changed, 5 insertions, 18 deletions

diff --git a/lib/libc/nls/msgcat.h b/lib/libc/nls/msgcat.h
index f13d888..403b33c 100644
--- a/lib/libc/nls/msgcat.h
+++ b/lib/libc/nls/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 */