diff options
author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-15 23:53:17 +0000 |
---|---|---|
committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-15 23:53:17 +0000 |
commit | 49e9468085d1a0d451703e614746bde8f81e2564 (patch) | |
tree | d77a957c69045603c3b734d2c8306778b75395ab | |
parent | 7583b6296b0e4cad4f090054f590e50275481eae (diff) |
* win32/win32.{h,c}: define rb_{p,g,u}id_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | win32/win32.c | 12 | ||||
-rw-r--r-- | win32/win32.h | 24 |
3 files changed, 22 insertions, 18 deletions
@@ -1,3 +1,7 @@ +Mon May 16 08:52:29 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * win32/win32.{h,c}: define rb_{p,g,u}id_t. + Mon May 16 00:21:02 2005 Tanaka Akira <akr@m17n.org> * lib/pathname.rb (Pathname#unlink): use SystemCallError instead of diff --git a/win32/win32.c b/win32/win32.c index 1beb79d2c6..35ca77827a 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1725,38 +1725,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 c3cdb2e2e8..b41b912e8e 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 @@ -140,7 +140,7 @@ struct timezone { #endif extern void NtInitialize(int *, char ***); extern int rb_w32_cmdvector(const char *, char ***); -extern pid_t pipe_exec(char *, int, FILE **, FILE **); +extern rb_pid_t pipe_exec(char *, int, FILE **, FILE **); extern int flock(int fd, int oper); extern int rb_w32_accept(int, struct sockaddr *, int *); extern int rb_w32_bind(int, struct sockaddr *, int); @@ -182,12 +182,12 @@ extern int rb_w32_snprintf(char *, size_t, const char *, ...); extern int chown(const char *, int, int); extern int link(char *, 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 do_spawn(int, char *); extern int do_aspawn(int, char *, char **); 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); @@ -266,12 +266,12 @@ extern FILE *rb_w32_fsopen(const char *, const char *, int); #if !defined(__BORLANDC__) extern int ioctl (int, unsigned int, long); #endif -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); |