Skip to content

Commit

Permalink
* dln.c, file.c, io.c, signal.c: add __HAIKU__.
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
nurse committed Jan 25, 2010
1 parent 0fdbdfb commit d5b0c4b
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions dln.c
Expand Up @@ -84,7 +84,7 @@ char *getenv();
# endif
#endif

#ifdef __BEOS__
#if defined(__BEOS__) || defined(__HAIKU__)
# include <image.h>
#endif

Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions file.c
Expand Up @@ -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)
{
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions io.c
Expand Up @@ -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

Expand Down Expand Up @@ -83,7 +83,7 @@

extern void Init_File(void);

#ifdef __BEOS__
#if defined(__BEOS__) || defined(__HAIKU__)
# ifndef NOFILE
# define NOFILE (OPEN_MAX)
# endif
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion signal.c
Expand Up @@ -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

Expand Down

0 comments on commit d5b0c4b

Please sign in to comment.