Fixed it up so it now compiles for R5 and Haiku. Don't know about

BONE or DANO, and I'm pretty sure it won't work in Zeta!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15784 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander G.M. Smith 2006-01-02 04:37:47 +00:00
parent c8cd524c67
commit 8e34360a9c
4 changed files with 7 additions and 7 deletions

View File

@ -44,7 +44,7 @@ All rights reserved.
#include <stdlib.h>
#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
#if !defined(HAIKU_TARGET_PLATFORM_DANO)
static rgb_color
mix_color(rgb_color color1, rgb_color color2, float portion)
{

View File

@ -619,7 +619,7 @@ status_t BAttributedMailAttachment::SetToRFC822(BPositionIO *data, size_t length
status_t BAttributedMailAttachment::RenderToRFC822(BPositionIO *render_to) {
BMallocIO *io = new BMallocIO;
#if defined(HAIKU_TARGET_PLATFORM_DANO) || defined(HAIKU_TARGET_PLATFORM_HAIKU)
#if defined(HAIKU_TARGET_PLATFORM_DANO)
const
#endif
char *name;

View File

@ -141,7 +141,7 @@ void BMailComponent::SetHeaderField(const char *key, BMessage *structure, bool r
const char *name, *sub_val;
type_code type;
for (int32 i = 0; structure->GetInfo(B_STRING_TYPE,i,
#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
#if !defined(HAIKU_TARGET_PLATFORM_DANO)
(char**)
#endif
&name,&type) == B_OK; i++)
@ -236,7 +236,7 @@ status_t BMailComponent::RemoveHeader(const char *key) {
}
const char *BMailComponent::HeaderAt(int32 index) {
#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
#if defined(HAIKU_TARGET_PLATFORM_DANO)
const
#endif
char *name = NULL;
@ -276,8 +276,8 @@ BMailComponent::RenderToRFC822(BPositionIO *render_to) {
headers.FindInt8 (kHeaderEncodingString, &encoding);
for (int32 index = 0; headers.GetInfo(B_STRING_TYPE,index,
#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
(const char**)
#if !defined(HAIKU_TARGET_PLATFORM_DANO)
(char**)
#endif
&key,&stupidity_personified,&count) == B_OK; index++) {
for (int32 g = 0; g < count; g++) {

View File

@ -19,7 +19,7 @@
*/
_EXPORT BNode& operator<<(BNode& n, const BMessage& m)
{
#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
#if defined(HAIKU_TARGET_PLATFORM_DANO)
const
#endif
char *name;