merge latest (4.3.99.16) from XFree86 (vendor) branch

1 files changed, 11 insertions, 11 deletions

diff --git a/lisp/io.h b/lisp/io.h
index eb5edc6..81b9424 100644
--- a/lisp/io.h
+++ b/lisp/io.h
@@ -27,12 +27,12 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/io.h,v 1.8 2002/12/06 03:25:27 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/io.h,v 1.10 2003/05/27 22:27:03 tsi Exp $ */
 
 #ifndef Lisp_io_h
 #define Lisp_io_h
 
-#include "private.h"
+#include "lisp/private.h"
 
 #define	FILE_READ	0x01
 #define FILE_WRITE	0x02
@@ -55,13 +55,13 @@ struct _LispFile {
     int length;			/* number of bytes used */
     int offset;			/* read/write offset */
     int unget : 8;		/* unread char */
-    int readable : 1;
-    int writable : 1;
-    int regular : 1;		/* regular file */
-    int buffered : 1;
-    int available : 1;		/* unget field holds a char */
-    int nonblock : 1;		/* in nonblock mode */
-    int binary : 1;		/* if set, don't calculate column/line-number */
+    unsigned int readable : 1;
+    unsigned int writable : 1;
+    unsigned int regular : 1;	/* regular file */
+    unsigned int buffered : 1;
+    unsigned int available : 1;	/* unget field holds a char */
+    unsigned int nonblock : 1;	/* in nonblock mode */
+    unsigned int binary : 1;	/* if set, don't calculate column/line-number */
     io_write_fn io_write;
 };
 
@@ -73,8 +73,8 @@ struct _LispString {
     int length;			/* number of bytes used */
     int input;			/* input offset, for read operations */
     int output;			/* output offset, for write operations */
-    int fixed : 1;		/* if set, don't try to reallocate string */
-    int binary : 1;		/* if set, don't calculate column/line-number */
+    unsigned int fixed : 1;	/* if set, don't try to reallocate string */
+    unsigned int binary : 1;	/* if set, don't calculate column/line-number */
 };
 
 /*