. renamed __str to __makestr to allow for g++

. changed some CMOS ioctl codes to have correct sizes (struct tm instead
  of u32_t), a disk ioctl code from W to RW, and memory ioctl codes from R
  to W, needed for proper matching of grant in FS

diff --git a/include/assert.h b/include/assert.h
index c97b35fbcae82539a7dcd1d920ac21cb6badc20e..13f3422dd9fe306a8016d48b043e457f3ba67da4 100755 (executable)
--- a/include/assert.h
+++ b/include/assert.h
@@ -25,8 +25,8 @@
 #else
 /* Debugging enabled -- verify assertions at run time. */
 #ifdef _ANSI
-#define        __str(x)        # x
-#define        __xstr(x)       __str(x)
+#define        __makestr(x)    # x
+#define        __xstr(x)       __makestr(x)
 
 _PROTOTYPE( void __bad_assertion, (const char *_mess) );
 #define        assert(expr)    ((expr)? (void)0 : \

diff --git a/include/sys/ioc_cmos.h b/include/sys/ioc_cmos.h
index e89355ef2143de20f0e038e260559cfab9c614e2..dfb26e7e05efdf0e683a36e95cd0632c0e72c171 100755 (executable)
--- a/include/sys/ioc_cmos.h
+++ b/include/sys/ioc_cmos.h
@@ -6,8 +6,8 @@
 
 #include <minix/ioctl.h>
 
-#define CIOCGETTIME    _IOR('c', 1, u32_t)
-#define CIOCGETTIMEY2K _IOR('c', 2, u32_t)
+#define CIOCGETTIME    _IOR('c', 1, struct tm)
+#define CIOCGETTIMEY2K _IOR('c', 2, struct tm)
 #define CIOCSETTIME    _IOW('c', 3, u32_t)
 #define CIOCSETTIMEY2K _IOW('c', 4, u32_t)
 

diff --git a/include/sys/ioc_disk.h b/include/sys/ioc_disk.h
index f5650637d45b7047b9d60ded08a559a40588d02b..4743f7e51167f6233b69b5ec1eb32da526e5c24f 100755 (executable)
--- a/include/sys/ioc_disk.h
+++ b/include/sys/ioc_disk.h
@@ -11,7 +11,7 @@
 #define DIOCSETP       _IOW('d', 3, struct partition)
 #define DIOCGETP       _IOR('d', 4, struct partition)
 #define DIOCEJECT      _IO ('d', 5)
-#define DIOCTIMEOUT    _IOW('d', 6, int)
+#define DIOCTIMEOUT    _IORW('d', 6, int)
 #define DIOCOPENCT     _IOR('d', 7, int)
 
 #endif /* _S_I_DISK_H */

diff --git a/include/sys/ioc_memory.h b/include/sys/ioc_memory.h
index d7f5fd4da03a9baaec321033d36081beb49b76b0..94c561c02a2f04763ca2c22cfde825e50c44c3de 100755 (executable)
--- a/include/sys/ioc_memory.h
+++ b/include/sys/ioc_memory.h
@@ -10,7 +10,7 @@
 #include <minix/ioctl.h>
 
 #define MIOCRAMSIZE    _IOW('m', 3, u32_t)
-#define MIOCMAP                _IOR('m', 4, struct mapreq)
-#define MIOCUNMAP      _IOR('m', 5, struct mapreq)
+#define MIOCMAP                _IOW('m', 4, struct mapreq)
+#define MIOCUNMAP      _IOW('m', 5, struct mapreq)
 
 #endif /* _S_I_MEMORY_H */