diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-25 03:06:06 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-25 03:06:06 +0000 |
commit | d5b0c4b1f3367b76f1b7af934f99cf1e1cb35b82 (patch) | |
tree | 3a329f41d65fa16ce0952640467e7bd261e65aef | |
parent | 0fdbdfbbda2e3d223d299b9df819402c3de82ecf (diff) |
* dln.c, file.c, io.c, signal.c: add __HAIKU__.
patched by Alexander von Gluck [ruby-core:27767]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | dln.c | 6 | ||||
-rw-r--r-- | file.c | 4 | ||||
-rw-r--r-- | io.c | 8 | ||||
-rw-r--r-- | signal.c | 2 |
5 files changed, 15 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Mon Jan 25 12:02:34 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * dln.c, file.c, io.c, signal.c: add __HAIKU__. + patched by Alexander von Gluck [ruby-core:27767] + Mon Jan 25 11:45:47 2010 NARUSE, Yui <naruse@ruby-lang.org> * math.c (domain_check): ignore errno if y is inf. @@ -84,7 +84,7 @@ char *getenv(); # endif #endif -#ifdef __BEOS__ +#if defined(__BEOS__) || defined(__HAIKU__) # include <image.h> #endif @@ -1433,7 +1433,7 @@ dln_load(const char *file) #endif /* rld or dyld */ #endif -#ifdef __BEOS__ +#if defined(__BEOS__) || defined(__HAIKU__) # define DLN_DEFINED { status_t err_stat; /* BeOS error status code */ @@ -1479,7 +1479,7 @@ dln_load(const char *file) (*init_fct)(); return (void*)img_id; } -#endif /* __BEOS__*/ +#endif /* __BEOS__ || __HAIKU__ */ #ifndef DLN_DEFINED dln_notimplement(); @@ -70,7 +70,7 @@ int flock(int, int); #define lstat stat #endif -#ifdef __BEOS__ /* should not change ID if -1 */ +#if defined(__BEOS__) || defined(__HAIKU__) /* should not change ID if -1 */ static int be_chown(const char *path, uid_t owner, gid_t group) { @@ -95,7 +95,7 @@ be_fchown(int fd, uid_t owner, gid_t group) return fchown(fd, owner, group); } #define fchown be_fchown -#endif /* __BEOS__ */ +#endif /* __BEOS__ || __HAIKU__ */ VALUE rb_cFile; VALUE rb_mFileTest; @@ -30,7 +30,7 @@ # include <sys/socket.h> #endif -#if defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__EMX__) || defined(__BEOS__) +#if defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__EMX__) || defined(__BEOS__) || defined(__HAIKU__) # define NO_SAFE_RENAME #endif @@ -83,7 +83,7 @@ extern void Init_File(void); -#ifdef __BEOS__ +#if defined(__BEOS__) || defined(__HAIKU__) # ifndef NOFILE # define NOFILE (OPEN_MAX) # endif @@ -162,7 +162,7 @@ static int max_file_descriptor = NOFILE; # define STDIO_READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0) #elif defined(FILE_READEND) # define STDIO_READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND) -#elif defined(__BEOS__) +#elif defined(__BEOS__) || defined(__HAIKU__) # define STDIO_READ_DATA_PENDING(fp) (fp->_state._eof == 0) #else # define STDIO_READ_DATA_PENDING(fp) (!feof(fp)) @@ -1525,7 +1525,7 @@ remain_size(rb_io_t *fptr) off_t pos; if (fstat(fptr->fd, &st) == 0 && S_ISREG(st.st_mode) -#ifdef __BEOS__ +#if defined(__BEOS__) || defined(__HAIKU__) && (st.st_dev > 3) #endif ) @@ -34,7 +34,7 @@ typedef int rb_atomic_t; # define ATOMIC_DEC(var) (--(var)) #endif -#ifdef __BEOS__ +#if defined(__BEOS__) || defined(__HAIKU__) #undef SIGBUS #endif |