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:
@@ -44,7 +44,7 @@ All rights reserved.
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
|
||||||
#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
|
#if !defined(HAIKU_TARGET_PLATFORM_DANO)
|
||||||
static rgb_color
|
static rgb_color
|
||||||
mix_color(rgb_color color1, rgb_color color2, float portion)
|
mix_color(rgb_color color1, rgb_color color2, float portion)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -619,7 +619,7 @@ status_t BAttributedMailAttachment::SetToRFC822(BPositionIO *data, size_t length
|
|||||||
|
|
||||||
status_t BAttributedMailAttachment::RenderToRFC822(BPositionIO *render_to) {
|
status_t BAttributedMailAttachment::RenderToRFC822(BPositionIO *render_to) {
|
||||||
BMallocIO *io = new BMallocIO;
|
BMallocIO *io = new BMallocIO;
|
||||||
#if defined(HAIKU_TARGET_PLATFORM_DANO) || defined(HAIKU_TARGET_PLATFORM_HAIKU)
|
#if defined(HAIKU_TARGET_PLATFORM_DANO)
|
||||||
const
|
const
|
||||||
#endif
|
#endif
|
||||||
char *name;
|
char *name;
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ void BMailComponent::SetHeaderField(const char *key, BMessage *structure, bool r
|
|||||||
const char *name, *sub_val;
|
const char *name, *sub_val;
|
||||||
type_code type;
|
type_code type;
|
||||||
for (int32 i = 0; structure->GetInfo(B_STRING_TYPE,i,
|
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**)
|
(char**)
|
||||||
#endif
|
#endif
|
||||||
&name,&type) == B_OK; i++)
|
&name,&type) == B_OK; i++)
|
||||||
@@ -236,7 +236,7 @@ status_t BMailComponent::RemoveHeader(const char *key) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const char *BMailComponent::HeaderAt(int32 index) {
|
const char *BMailComponent::HeaderAt(int32 index) {
|
||||||
#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
|
#if defined(HAIKU_TARGET_PLATFORM_DANO)
|
||||||
const
|
const
|
||||||
#endif
|
#endif
|
||||||
char *name = NULL;
|
char *name = NULL;
|
||||||
@@ -276,8 +276,8 @@ BMailComponent::RenderToRFC822(BPositionIO *render_to) {
|
|||||||
headers.FindInt8 (kHeaderEncodingString, &encoding);
|
headers.FindInt8 (kHeaderEncodingString, &encoding);
|
||||||
|
|
||||||
for (int32 index = 0; headers.GetInfo(B_STRING_TYPE,index,
|
for (int32 index = 0; headers.GetInfo(B_STRING_TYPE,index,
|
||||||
#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
|
#if !defined(HAIKU_TARGET_PLATFORM_DANO)
|
||||||
(const char**)
|
(char**)
|
||||||
#endif
|
#endif
|
||||||
&key,&stupidity_personified,&count) == B_OK; index++) {
|
&key,&stupidity_personified,&count) == B_OK; index++) {
|
||||||
for (int32 g = 0; g < count; g++) {
|
for (int32 g = 0; g < count; g++) {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
*/
|
*/
|
||||||
_EXPORT BNode& operator<<(BNode& n, const BMessage& m)
|
_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
|
const
|
||||||
#endif
|
#endif
|
||||||
char *name;
|
char *name;
|
||||||
|
|||||||
Reference in New Issue
Block a user