diff --git a/ase/configure.ac b/ase/configure.ac
index ec63ef92..b1ea3222 100644
--- a/ase/configure.ac
+++ b/ase/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.53)
 AC_INIT([xpkit], [deb-0.1.0])
-AC_REVISION([$Revision: 1.25 $])
+AC_REVISION([$Revision: 1.26 $])
 AC_CONFIG_HEADER([xp/config.h])
 
 # Checks for programs.
@@ -63,5 +63,6 @@ AC_CHECK_FILE([/NextDeveloper],[AC_DEFINE([_POSIX_SOURCE],[],[_POSIX_SOURCE])])
 AC_CONFIG_FILES([
 	Makefile utils/Makefile xp/Makefile 
 	xp/c/Makefile xp/mp/Makefile xp/lisp/Makefile 
-	xp/test/c/Makefile xp/test/lisp/Makefile])
+	xp/test/c/Makefile xp/test/lisp/Makefile
+	xpp/sys/Makefile])
 AC_OUTPUT
diff --git a/ase/macros.h b/ase/macros.h
index 860c0844..15689f9c 100644
--- a/ase/macros.h
+++ b/ase/macros.h
@@ -1,5 +1,5 @@
 /*
- * $Id: macros.h,v 1.11 2005-02-06 03:27:54 bacon Exp $
+ * $Id: macros.h,v 1.12 2005-03-29 07:29:13 bacon Exp $
  */
 
 #ifndef _XP_MACROS_H_
@@ -7,7 +7,12 @@
 
 #include <xp/types.h>
 
-#define XP_NULL ((void*)0)
+#ifdef __cplusplus
+	#define XP_NULL ((xp_uint_t)0)
+#else
+	#define XP_NULL ((void*)0)
+#endif
+
 #define XP_EOF  ((xp_cint_t)-1)
 
 #define xp_sizeof(n)   (sizeof(n))