Normalize inclusion guards: use NAME_H for name.h. Some headers

lacked them, others used reserved identifiers.

src/client/ioqueue.h

@@ -32,6 +32,9 @@
  *  
  */
 
+#ifndef IOQUEUE_H
+#define IOQUEUE_H
+
 struct ioqueue {
     struct qelem queue;		/* queue fwd/back */
     int bsize;			/* basic block size */
@@ -53,3 +56,5 @@ void ioq_write(struct ioqueue *ioq, char *buf, int cc);
 int ioq_qsize(struct ioqueue *ioq);
 void ioq_drain(struct ioqueue *ioq);
 char *ioq_gets(struct ioqueue *ioq, char *buf, int cc, int *eol);
+
+#endif

src/client/misc.h

@@ -31,8 +31,8 @@
  *     Steve McClure, 1998
  */
 
-#ifndef _MISC_H_
-#define _MISC_H_
+#ifndef MISC_H
+#define MISC_H
 
 #include <ctype.h>
 #include <stdio.h>

src/client/proto.h

@@ -36,6 +36,9 @@
  * to be compiled independently of the rest of the game.
  */
 
+#ifndef PROTO_H
+#define PROTO_H
+
 #define CLIENTPROTO	2	/* if new things are added, bump this */
 
 #define	C_CMDOK		0x0
@@ -54,3 +57,5 @@
 #define C_FLASH		0xD
 #define C_INFORM        0xE
 #define C_LAST          0xE
+
+#endif

src/client/queue.h

@@ -31,8 +31,8 @@
  *  
  */
 
-#ifndef _QUEUE
-#define _QUEUE
+#ifndef QUEUE_H
+#define QUEUE_H
 
 #define	QEMPTY(p)	((p)->q_forw == (p))
 
@@ -46,4 +46,4 @@ void remque(struct qelem *p);
 void initque(struct qelem *p);
 struct qelem *makeqt(int nelem);
 
-#endif /* _QUEUE */
+#endif

src/client/tags.h

@@ -31,8 +31,8 @@
  *     John Yockey, 1998
  */
 
-#ifndef _TAGS_H_
-#define _TAGS_H_
+#ifndef TAGS_H
+#define TAGS_H
 
 struct tagstruct {
     char *item;

src/lib/as/as.h

@@ -27,6 +27,9 @@
  *  Added path list caching structures
  */
 
+#ifndef AS_H
+#define AS_H
+
 #include <stdio.h>		/* for FILE */
 #include "misc.h"		/* for s_char */
 
@@ -183,3 +186,5 @@ extern void as_setcinq(struct as_data *adp,
 extern void as_free_hashtab(struct as_data *adp);
 extern int as_winnow(struct as_data *adp,
 		     struct as_coord *coords, int ncoords);
+
+#endif

src/lib/lwp/lwpint.h

@@ -21,8 +21,8 @@
  * Imperial College of Science, Technology and Medicine, 180 Queen's
  * Gate, London SW7 2BZ, England.
  */
-#ifndef _LWPINT_H
-#define _LWPINT_H
+#ifndef LWPINT_H
+#define LWPINT_H
 
 #ifdef UCONTEXT
 #include <ucontext.h>
@@ -90,4 +90,4 @@ void lwpEntryPoint(void);
 void lwpInitSelect(struct lwpProc * self);
 void lwpDestroy(struct lwpProc * proc);
 
-#endif /* _LWP_H */
+#endif