--- ray/src/common/lookup.h	2003/02/25 02:47:21	2.7
+++ ray/src/common/lookup.h	2003/06/06 16:38:47	2.8
@@ -1,8 +1,14 @@
-/* RCSid $Id: lookup.h,v 2.7 2003/02/25 02:47:21 greg Exp $ */
+/* RCSid $Id: lookup.h,v 2.8 2003/06/06 16:38:47 schorsch Exp $ */
 /*
  * Header file for general associative table lookup routines
  */
+#ifndef _RAD_LOOKUP_H_
+#define _RAD_LOOKUP_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+
 #include "copyright.h"
 
 typedef struct {
@@ -72,19 +78,8 @@ typedef struct {
  * allocated table itself.
  */
 
-extern int	strcmp();
+#include <string.h> /* strcmp() */
 
-#ifdef NOPROTO
-
-extern int	lu_init();
-extern LUENT	*lu_find();
-extern void	lu_delete();
-extern int	lu_doall();
-extern void	lu_done();
-extern unsigned long	lu_shash();
-
-#else
-
 extern int	lu_init(LUTAB *tbl, int nel);
 extern unsigned long	lu_shash(char *s);
 extern LUENT	*lu_find(LUTAB *tbl, char *key);
@@ -92,4 +87,9 @@ extern void	lu_delete(LUTAB *tbl, char *key);
 extern int	lu_doall(LUTAB *tbl, int (*f)());
 extern void	lu_done(LUTAB *tbl);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_LOOKUP_H_ */
+