From 3f6cd154a24bfcea6d0b6d3a2c73d5d163b99940 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Thu, 1 Sep 2005 13:07:08 +0000
Subject: [PATCH] Joren l'Ami's fixes to includes for gcc

---
 include/minix/sys_config.h | 2 +-
 include/setjmp.h           | 6 +++++-
 include/stdio.h            | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/minix/sys_config.h b/include/minix/sys_config.h
index cf6cec161..7a86e076f 100755
--- a/include/minix/sys_config.h
+++ b/include/minix/sys_config.h
@@ -13,7 +13,7 @@
 #define _MACHINE_MACINTOSH         62	/* Apple Macintosh (68000) */
 
 /* Word size in bytes (a constant equal to sizeof(int)). */
-#if __ACK__
+#if __ACK__ || __GNUC__
 #define _WORD_SIZE	_EM_WSIZE
 #define _PTR_SIZE	_EM_WSIZE
 #endif
diff --git a/include/setjmp.h b/include/setjmp.h
index 970d1c4af..31a879533 100755
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -84,7 +84,7 @@
 #define _SETJMP_SAVES_REGS 1
 #endif
 #ifdef __GNUC__
-#define _SETJMP_SYMBOL 0
+#define _SETJMP_SYMBOL 1
 #define _SETJMP_SAVES_REGS 1
 #endif
 
@@ -119,7 +119,11 @@ _PROTOTYPE(void _longjmp, (jmp_buf _env, int _val)			);
 
 #ifdef _POSIX_SOURCE
 typedef jmp_buf sigjmp_buf;
+#ifdef __GNUC__
+#define siglongjmp longjmp
+#else
 _PROTOTYPE( void siglongjmp, (sigjmp_buf _env, int _val)		);
+#endif
 
 #define sigsetjmp(env, savemask) __setjmp((env), (savemask))
 #endif /* _POSIX_SOURCE */
diff --git a/include/stdio.h b/include/stdio.h
index 2a8dd676c..1e83bbc48 100755
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -36,6 +36,7 @@ typedef struct __iobuf {
 #define	_IOREADING	0x080
 #define	_IOWRITING	0x100
 #define	_IOAPPEND	0x200
+#define _IOFIFO		0x400
 
 /* The following definitions are also in <unistd.h>. They should not
  * conflict.