+

src/pkg-psyc.h

@@ -1,4 +1,5 @@
 #ifdef USE_PSYC
+# ifndef PKG_PSYC_H
 
 /* pkg-psyc takes and produces PSYC packets in form
  * of an array of mapping, mapping, string and string
@@ -12,6 +13,9 @@
 
 # include <psyc/parser.h>
 
+# include "array.h"
+# include "xalloc.h"
+
 typedef struct {
     psycParseState *parser;
     vector_t *packet;
@@ -24,11 +28,13 @@ psyc_free_parser (psycState *ps) {
     if (!ps)
 	return;
     if (ps->tmp)
-	pxfree((void *) ps->tmp);
+	pfree((void *) ps->tmp);
     if (ps->parser)
-	pxfree((void *) ps->parser);
+	pfree((void *) ps->parser);
     if (ps->packet)
 	free_array(ps->packet);
 }
 
+# define PKG_PSYC_H
+# endif
 #endif

src/sent.h

@@ -44,7 +44,7 @@
 #include "typedefs.h"
 
 #ifdef USE_PSYC
-# include <psyc/parser.h>
+# include "pkg-psyc.h"
 #endif
 
 enum sent_type_e {

src/version.sh

@@ -17,7 +17,7 @@ version_longtype="stable"
 # A timestamp, to be used by bumpversion and other scripts.
 # It can be used, for example, to 'touch' this file on every build, thus
 # forcing revision control systems to add it on every checkin automatically.
-version_stamp="Fri May  6 22:13:45 CEST 2011"
+version_stamp="Sun May  8 21:03:26 CEST 2011"
 
 # Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
 version_major=4