Joren l'Ami's fixes to includes for gcc

diff --git a/include/minix/sys_config.h b/include/minix/sys_config.h
index cf6cec161d2ebe38825925c726963f3822f05d8e..7a86e076f521384200faca2169aff198b6dbc0b8 100755 (executable)
--- 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 970d1c4af8c543fd14b222c0f37e7294aeac0dab..31a879533a3fbc61b3d6ef726731894b8c2e9156 100755 (executable)
--- 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 2a8dd676cf28de349c264107f9d3acb2e1390fc3..1e83bbc48d0c1cda49bb10b57a5acfd5b4406a79 100755 (executable)
--- 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.