diff options
Diffstat (limited to 'win32')
-rw-r--r-- | win32/win32.c | 12 | ||||
-rw-r--r-- | win32/win32.h | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/win32/win32.c b/win32/win32.c index cb16d30245..82b7810ac4 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1772,38 +1772,38 @@ rb_w32_strerror(int e) #define ROOT_UID 0 #define ROOT_GID 0 -UIDTYPE +rb_uid_t getuid(void) { return ROOT_UID; } -UIDTYPE +rb_uid_t geteuid(void) { return ROOT_UID; } -GIDTYPE +rb_gid_t getgid(void) { return ROOT_GID; } -GIDTYPE +rb_gid_t getegid(void) { return ROOT_GID; } int -setuid(int uid) +setuid(rb_uid_t uid) { return (uid == ROOT_UID ? 0 : -1); } int -setgid(int gid) +setgid(rb_gid_t gid) { return (gid == ROOT_GID ? 0 : -1); } diff --git a/win32/win32.h b/win32/win32.h index 25e949a7a9..efbef04bdd 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -69,9 +69,9 @@ extern "C++" { } #endif -#define UIDTYPE int -#define GIDTYPE int -#define pid_t int +#define rb_pid_t int +#define rb_gid_t int +#define rb_uid_t int #define WNOHANG -1 #undef getc @@ -143,7 +143,7 @@ struct timezone { #endif extern void NtInitialize(int *, char ***); extern int rb_w32_cmdvector(const char *, char ***); -extern pid_t rb_w32_pipe_exec(const char *, const char *, int, int *); +extern rb_pid_t rb_w32_pipe_exec(const char *, const char *, int, int *); extern int flock(int fd, int oper); extern int rb_w32_is_socket(int); extern int rb_w32_accept(int, struct sockaddr *, int *); @@ -187,14 +187,14 @@ extern int rb_w32_snprintf(char *, size_t, const char *, ...); extern int chown(const char *, int, int); extern int link(const char *, const char *); extern int gettimeofday(struct timeval *, struct timezone *); -extern pid_t waitpid (pid_t, int *, int); +extern rb_pid_t waitpid (rb_pid_t, int *, int); extern int rb_w32_argv_size(char *const *); extern char *rb_w32_join_argv(char *, char *const *); extern int rb_w32_spawn(int, const char *, const char*); extern int rb_w32_aspawn(int, const char *, char *const *); extern int kill(int, int); extern int fcntl(int, int, ...); -extern pid_t rb_w32_getpid(void); +extern rb_pid_t rb_w32_getpid(void); #if !defined(__BORLANDC__) && !defined(_WIN32_WCE) extern int rb_w32_isatty(int); #endif @@ -271,12 +271,12 @@ extern FILE *rb_w32_fsopen(const char *, const char *, int); // stubs // extern int ioctl (int, int, ...); -extern UIDTYPE getuid (void); -extern UIDTYPE geteuid (void); -extern GIDTYPE getgid (void); -extern GIDTYPE getegid (void); -extern int setuid (int); -extern int setgid (int); +extern rb_uid_t getuid (void); +extern rb_uid_t geteuid (void); +extern rb_gid_t getgid (void); +extern rb_gid_t getegid (void); +extern int setuid (rb_uid_t); +extern int setgid (rb_gid_t); extern char *rb_w32_strerror(int); |