From 10dc4a2c37597e02c12a9df3e9dba02a73bfc11b Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue, 25 Nov 2003 19:29:12 +0000
Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

---
 lisp/private.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'lisp/private.h')

diff --git a/lisp/private.h b/lisp/private.h
index 6e5b128..6b78d02 100644
--- a/lisp/private.h
+++ b/lisp/private.h
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.39 2002/12/20 04:32:46 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.41 2003/05/27 22:27:04 tsi Exp $ */
 
 #ifndef Lisp_private_h
 #define Lisp_private_h
@@ -38,15 +38,15 @@
 #include <setjmp.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include "internal.h"
+#include "lisp/internal.h"
 
-#include "core.h"
+#include "lisp/core.h"
 #ifdef DEBUGGER
-#include "debugger.h"
+#include "lisp/debugger.h"
 #endif
-#include "helper.h"
-#include "string.h"
-#include "struct.h"
+#include "lisp/helper.h"
+#include "lisp/string.h"
+#include "lisp/struct.h"
 
 /*
  * Defines
@@ -55,10 +55,10 @@
 #define MULTIPLE_VALUES_LIMIT	127
 #define MAX_STACK_DEPTH		16384
 
-#define FEATURES						\
-    lisp__data.features->data.atom->a_object ?			\
-	lisp__data.features->data.atom->property->value :	\
-	NIL
+#define FEATURES							\
+    (lisp__data.features->data.atom->a_object ?				\
+	(LispObj *)lisp__data.features->data.atom->property->value :	\
+	NIL)
 #define PACK	lisp__data.packlist
 #define PACKAGE	lisp__data.package->data.atom->property->value
 #define MOD	lisp__data.modlist
-- 
cgit v1.2.3