From 9f5d0de96f079e84c648a0173bffac8ec2c3bef5 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:46 +0000
Subject: Merging XORG-CURRENT into trunk

---
 lisp/internal.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'lisp/internal.h')

diff --git a/lisp/internal.h b/lisp/internal.h
index a0c6f10..a866084 100644
--- a/lisp/internal.h
+++ b/lisp/internal.h
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * Copyright (c) 2001 by The XFree86 Project, Inc.
  *
@@ -27,7 +28,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/internal.h,v 1.51 2003/05/27 22:27:03 tsi Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/internal.h,v 1.50tsi Exp $ */
 
 #ifndef Lisp_internal_h
 #define Lisp_internal_h
@@ -549,6 +550,13 @@ typedef struct {
     LispObj *errorp;		/* ALWAYS (ONLY) READABLE: stderr of program */
 } LispPipe;
 
+/* silly IBM compiler */
+#ifdef AIXV5 /* probably want !gcc too */
+#define LispType int
+#define LispFunType int
+#define LispStreamType int
+#endif
+
 struct _LispObj {
     LispType type : 6;
     unsigned int mark : 1;	/* gc protected */
@@ -641,6 +649,11 @@ struct _LispObj {
 	} hash;
     } data;
 };
+#ifdef AIXV5
+#undef LispType
+#undef LispFunType
+#undef LispStreamType
+#endif
 
 typedef	LispObj *(*LispFunPtr)(LispBuiltin*);
 typedef void (*LispComPtr)(LispCom*, LispBuiltin*);
-- 
cgit v1.2.3