sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

. renamed __str to __makestr to allow for g++

Browse source 
. 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
This commit is contained in:
Ben Gras 2006-06-20 08:40:26 +00:00
parent aaca17c36d
commit cfb984e9bd
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/assert.h
View file

@ -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 : \

4
include/sys/ioc_cmos.h
View file

@ -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)

2
include/sys/ioc_disk.h
View file

@ -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 */

4
include/sys/ioc_memory.h
View file

@ -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 */