[Wisp-cvs] wisp/src mem.h,1.38,1.39 wordreg.h.nepl,1.30,1.31

[<di...@us...>]

Update of /cvsroot/wisp/wisp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13594/src

Modified Files:
	mem.h wordreg.h.nepl 
Log Message:
GCC 3.2 compatibility fixes

Index: mem.h
===================================================================
RCS file: /cvsroot/wisp/wisp/src/mem.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- mem.h	4 Sep 2002 14:31:41 -0000	1.38
+++ mem.h	1 Feb 2003 14:24:45 -0000	1.39
@@ -1,7 +1,7 @@
 /*
  * mem.h - declare the Wisp memory management routines
  *
- * Copyleft © 2002 by Andres Soolo (di...@us...)
+ * Copyleft © 2003 by Andres Soolo (di...@us...)
  * This file is licensed under the GNU GPL v2.  If you
  * don't know what that means, please do read the GPL.
  *
@@ -11,6 +11,8 @@
 #ifndef _MEM_H
 
 #define _MEM_H
+
+#include <string.h>
 
 #include <config.h>
 

Index: wordreg.h.nepl
===================================================================
RCS file: /cvsroot/wisp/wisp/src/wordreg.h.nepl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- wordreg.h.nepl	4 Sep 2002 14:31:41 -0000	1.30
+++ wordreg.h.nepl	1 Feb 2003 14:24:45 -0000	1.31
@@ -6,7 +6,7 @@
 /*
  * wordreg.h - the C header file for word registration.
  *
- * Copyleft © 2000 by Andres Soolo (di...@us...)
+ * Copyleft © 2003 by Andres Soolo (di...@us...)
  * This file is licensed under the GNU GPL v2.  If you
  * don't know what that means, please do read the GPL.
  *
@@ -82,9 +82,10 @@
 
 #define wordreg_add_node(symbol,word,wordspace,wordhashed) \
 { \
-    static struct wrhashnode p = {data: (struct wordreg_node *) \
-        &(struct {struct node *sym; char s[wordspace];}) \
-        {symbol, word}, val: (unsigned long int) wordhashed}; \
+    static struct {struct node *sym; char s[wordspace];} d = \
+        {symbol, word}; \
+    static struct wrhashnode p = {data: (struct wordreg_node *) &d, \
+        val: (unsigned long int) wordhashed}; \
     size_t i = ((unsigned long int) wordhashed) % WRHASHTAB_SIZE; \
     p.next = wordreg->tab [i]; \
     wordreg->tab [i] = &p; \
@@ -95,3 +96,4 @@
 
 #endif /* _WORDREG_H */
 #perl
+# vim: ft=c