Pull in sources from zephyr locker. See /mit/zephyr/repository for

detailed change information.

1 files changed, 15 insertions, 24 deletions

diff --git a/server/zstring.h b/server/zstring.h
index 5d3aaa1..eb3a3da 100644
--- a/server/zstring.h
+++ b/server/zstring.h
@@ -12,33 +12,24 @@
 #ifndef __zstring_h
 #define __zstring_h __FILE__
 
-#define ZSTRING_HASH_TABLE_SIZE	1024
+#define STRING_HASH_TABLE_SIZE	1024
 
 #include <stdio.h>
 
-typedef struct _zstring
+typedef struct _String
 {
-  char *string;			/* the string itself */
-  int ref_count;		/* for gc */
-  unsigned long hash_val;	/* hash value for this string */
-  struct _zstring *next;	/* for linking in hash table */
-  struct _zstring *prev;	/* for linking in hash table */
-} ZSTRING;
-
-#ifdef __STDC__
-# define        P(s) s
-#else
-# define P(s) ()
-#endif
-
-ZSTRING *make_zstring P((char *s, int downcase));
-void free_zstring P((ZSTRING *z));
-ZSTRING *find_zstring P((char *s, int downcase));
-ZSTRING *dup_zstring P((ZSTRING *z));
-int comp_zstring P((ZSTRING *a, ZSTRING *b));
-void print_zstring_table P((FILE *f));
-
-#undef P
-
+  char *string;				/* the string itself */
+  int ref_count;			/* for gc */
+  unsigned long hash_val;		/* hash value for this string */
+  struct _String *next, *prev;		/* for linking in hash table */
+} String;
+
+String *make_string __P((char *s, int downcase));
+void free_string __P((String *z));
+String *find_string __P((char *s, int downcase));
+String *dup_string __P((String *z));
+int comp_string __P((String *a, String *b));
+void print_string_table __P((FILE *f));
 
 #endif /* __zstring_h */
+