From b0f40dcb1594ad8981438d852c69f4a4f4154759 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Tue, 27 Jan 2009 19:31:12 +0000 Subject: [PATCH] These apply to Haiku as well. Fixes binutils build with current GCC2 package on Haiku. git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@29062 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- binutils/include/binary-io.h | 4 ++-- binutils/intl/loadmsgcat.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/binutils/include/binary-io.h b/binutils/include/binary-io.h index 2984271f7e..30d716b752 100644 --- a/binutils/include/binary-io.h +++ b/binutils/include/binary-io.h @@ -30,8 +30,8 @@ # define O_BINARY _O_BINARY # define O_TEXT _O_TEXT #endif -#ifdef __BEOS__ - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ +#if defined(__BEOS__) || defined(__HAIKU__) + /* BeOS 5 and Haiku R1 have O_BINARY and O_TEXT, but they have no effect. */ # undef O_BINARY # undef O_TEXT #endif diff --git a/binutils/intl/loadmsgcat.c b/binutils/intl/loadmsgcat.c index 536ee12621..8d282ae704 100644 --- a/binutils/intl/loadmsgcat.c +++ b/binutils/intl/loadmsgcat.c @@ -480,8 +480,8 @@ char *alloca (); # define O_BINARY _O_BINARY # define O_TEXT _O_TEXT #endif -#ifdef __BEOS__ - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ +#if defined(__BEOS__) || defined(__HAIKU__) + /* BeOS 5 and Haiku R1 have O_BINARY and O_TEXT, but they have no effect. */ # undef O_BINARY # undef O_TEXT #endif