Remove the types Dev_t, _mnx_Gui, _mnx_Uid, and similar.
Use ANSI-style function declarations where necessary.
This commit is contained in:
@@ -64,7 +64,7 @@ struct flock {
|
||||
};
|
||||
|
||||
/* Function Prototypes. */
|
||||
_PROTOTYPE( int creat, (const char *_path, _mnx_Mode_t _mode) );
|
||||
_PROTOTYPE( int creat, (const char *_path, mode_t _mode) );
|
||||
_PROTOTYPE( int fcntl, (int _filedes, int _cmd, ...) );
|
||||
_PROTOTYPE( int open, (const char *_path, int _oflag, ...) );
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ struct group {
|
||||
};
|
||||
|
||||
/* Function Prototypes. */
|
||||
_PROTOTYPE( struct group *getgrgid, (_mnx_Gid_t _gid) );
|
||||
_PROTOTYPE( struct group *getgrgid, (gid_t _gid) );
|
||||
_PROTOTYPE( struct group *getgrnam, (const char *_name) );
|
||||
|
||||
#ifdef _MINIX
|
||||
|
||||
@@ -110,10 +110,6 @@ typedef short uid_t; /* user id */
|
||||
* sufficient to just use int instead of dev_t in the prototypes, but Dev_t
|
||||
* is clearer.
|
||||
*/
|
||||
typedef int Dev_t;
|
||||
typedef int _mnx_Gid_t;
|
||||
typedef int Nlink_t;
|
||||
typedef int _mnx_Uid_t;
|
||||
typedef unsigned long U32_t;
|
||||
typedef int I16_t;
|
||||
typedef long I32_t;
|
||||
@@ -123,14 +119,12 @@ typedef long I32_t;
|
||||
typedef unsigned int Zone1_t;
|
||||
typedef unsigned int Bitchunk_t;
|
||||
typedef unsigned int U16_t;
|
||||
typedef unsigned int _mnx_Mode_t;
|
||||
|
||||
#else /* _EM_WSIZE == 4, or _EM_WSIZE undefined */
|
||||
/*typedef int Ino_t; Ino_t is now 32 bits */
|
||||
typedef int Zone1_t;
|
||||
typedef int Bitchunk_t;
|
||||
typedef int U16_t;
|
||||
typedef int _mnx_Mode_t;
|
||||
|
||||
#endif /* _EM_WSIZE == 2, etc */
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ struct passwd {
|
||||
|
||||
/* Function Prototypes. */
|
||||
_PROTOTYPE( struct passwd *getpwnam, (const char *_name) );
|
||||
_PROTOTYPE( struct passwd *getpwuid, (_mnx_Uid_t _uid) );
|
||||
_PROTOTYPE( struct passwd *getpwuid, (uid_t _uid) );
|
||||
|
||||
#ifdef _MINIX
|
||||
_PROTOTYPE( void endpwent, (void) );
|
||||
|
||||
@@ -66,13 +66,13 @@ struct stat {
|
||||
#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) /* is a pipe/FIFO */
|
||||
|
||||
/* Function Prototypes. */
|
||||
_PROTOTYPE( int chmod, (const char *_path, _mnx_Mode_t _mode) );
|
||||
_PROTOTYPE( int fchmod, (int fd, _mnx_Mode_t _mode) );
|
||||
_PROTOTYPE( int chmod, (const char *_path, mode_t _mode) );
|
||||
_PROTOTYPE( int fchmod, (int fd, mode_t _mode) );
|
||||
_PROTOTYPE( int fstat, (int _fildes, struct stat *_buf) );
|
||||
_PROTOTYPE( int mkdir, (const char *_path, _mnx_Mode_t _mode) );
|
||||
_PROTOTYPE( int mkfifo, (const char *_path, _mnx_Mode_t _mode) );
|
||||
_PROTOTYPE( int mkdir, (const char *_path, mode_t _mode) );
|
||||
_PROTOTYPE( int mkfifo, (const char *_path, mode_t _mode) );
|
||||
_PROTOTYPE( int stat, (const char *_path, struct stat *_buf) );
|
||||
_PROTOTYPE( mode_t umask, (_mnx_Mode_t _cmask) );
|
||||
_PROTOTYPE( mode_t umask, (mode_t _cmask) );
|
||||
|
||||
/* Open Group Base Specifications Issue 6 (not complete) */
|
||||
_PROTOTYPE( int lstat, (const char *_path, struct stat *_buf) );
|
||||
|
||||
@@ -99,8 +99,8 @@ _PROTOTYPE( int access, (const char *_path, int _amode) );
|
||||
_PROTOTYPE( unsigned int alarm, (unsigned int _seconds) );
|
||||
_PROTOTYPE( int chdir, (const char *_path) );
|
||||
_PROTOTYPE( int fchdir, (int fd) );
|
||||
_PROTOTYPE( int chown, (const char *_path, _mnx_Uid_t _owner, _mnx_Gid_t _group) );
|
||||
_PROTOTYPE( int fchown, (int fd, _mnx_Uid_t _owner, _mnx_Gid_t _group) );
|
||||
_PROTOTYPE( int chown, (const char *_path, uid_t _owner, gid_t _group) );
|
||||
_PROTOTYPE( int fchown, (int fd, uid_t _owner, gid_t _group) );
|
||||
_PROTOTYPE( int close, (int _fd) );
|
||||
_PROTOTYPE( char *ctermid, (char *_s) );
|
||||
_PROTOTYPE( char *cuserid, (char *_s) );
|
||||
@@ -135,11 +135,11 @@ _PROTOTYPE( int pipe, (int _fildes[2]) );
|
||||
_PROTOTYPE( ssize_t read, (int _fd, void *_buf, size_t _n) );
|
||||
_PROTOTYPE( ssize_t pread, (int, void *, size_t, off_t) );
|
||||
_PROTOTYPE( int rmdir, (const char *_path) );
|
||||
_PROTOTYPE( int setgid, (_mnx_Gid_t _gid) );
|
||||
_PROTOTYPE( int setegid, (_mnx_Gid_t _gid) );
|
||||
_PROTOTYPE( int setgid, (gid_t _gid) );
|
||||
_PROTOTYPE( int setegid, (gid_t _gid) );
|
||||
_PROTOTYPE( pid_t setsid, (void) );
|
||||
_PROTOTYPE( int setuid, (_mnx_Uid_t _uid) );
|
||||
_PROTOTYPE( int seteuid, (_mnx_Uid_t _uid) );
|
||||
_PROTOTYPE( int setuid, (uid_t _uid) );
|
||||
_PROTOTYPE( int seteuid, (uid_t _uid) );
|
||||
_PROTOTYPE( unsigned int sleep, (unsigned int _seconds) );
|
||||
_PROTOTYPE( long sysconf, (int _name) );
|
||||
_PROTOTYPE( pid_t tcgetpgrp, (int _fd) );
|
||||
@@ -170,8 +170,8 @@ _PROTOTYPE( int brk, (char *_addr) );
|
||||
_PROTOTYPE( int chroot, (const char *_name) );
|
||||
_PROTOTYPE( int lseek64, (int _fd, u64_t _offset, int _whence,
|
||||
u64_t *_newpos) );
|
||||
_PROTOTYPE( int mknod, (const char *_name, _mnx_Mode_t _mode, Dev_t _addr) );
|
||||
_PROTOTYPE( int mknod4, (const char *_name, _mnx_Mode_t _mode, Dev_t _addr,
|
||||
_PROTOTYPE( int mknod, (const char *_name, mode_t _mode, dev_t _addr) );
|
||||
_PROTOTYPE( int mknod4, (const char *_name, mode_t _mode, dev_t _addr,
|
||||
long _size) );
|
||||
_PROTOTYPE( char *mktemp, (char *_template) );
|
||||
_PROTOTYPE( long ptrace, (int _req, pid_t _pid, long _addr, long _data) );
|
||||
|
||||
Reference in New Issue
Block a user