Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tried to get MDR to compile under Zeta RC3 but to no avail, with lots of

Browse Source 
brick wall collisions.  Along the way I found a few defines that no longer
exist in Haiku - changed B_BEOS_VERSION_DANO to use Haiku versions (anyone
rebuilding under Dano might want to undo it).  By the way, the BeOS version
number define system might be worth using, since it's a numerical compare
rather than #if defined(V1) || defined (V2) || defined (V3) and so on.

What sort of errors?  Besides needing libzeta.so for some things, the
networking compatibility compile doesn't work (libbind and all that).
Some examples among many:

In file included from /boot/home/Haiku/src/kits/mail/numailkit.cpp:14:
/boot/develop/headers/be/support/Autolock.h:3: using directive `BAutolock' introduced ambiguous type `BAutolock'

In file included from /boot/home/Haiku/src/kits/network/compat/libnet/netdebug.c:6:
/boot/home/Haiku/headers/private/net/netdebug.h:32: syntax error before `void'


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15775 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander G.M. Smith 2006-01-01 23:59:24 +00:00
parent 7da062312a
commit deb238df7d
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/private/mail/NodeMessage.h
View File

@ -23,7 +23,7 @@
#include <Node.h>
#include <Message.h>
#ifdef B_BEOS_VERSION_DANO
#if defined(HAIKU_TARGET_PLATFORM_DANO) || defined(HAIKU_TARGET_PLATFORM_HAIKU)
#define _IMPEXP_MAIL
#endif

4
src/apps/bemail/BmapButton.cpp
View File

@ -44,7 +44,7 @@ All rights reserved.
#include <stdlib.h>
#ifndef B_BEOS_VERSION_DANO
#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
static rgb_color
mix_color(rgb_color color1, rgb_color color2, float portion)
{
@ -61,7 +61,7 @@ disable_color(rgb_color color, rgb_color background)
{
return mix_color(color, background, .5);
}
#endif // #ifndef B_BEOS_VERSION_DANO
#endif // #if older versions of BeOS, like R5.
BList BmapButton::fBitmapCache;
BLocker BmapButton::fBmCacheLock;

2
src/kits/mail/MailAttachment.cpp
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 B_BEOS_VERSION_DANO
#if defined(HAIKU_TARGET_PLATFORM_DANO) || defined(HAIKU_TARGET_PLATFORM_HAIKU)
const
#endif
char *name;

8
src/kits/mail/MailComponent.cpp
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,
#ifndef B_BEOS_VERSION_DANO
#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
(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 B_BEOS_VERSION_DANO
#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
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,
#ifndef B_BEOS_VERSION_DANO
(char**)
#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
(const char**)
#endif
&key,&stupidity_personified,&count) == B_OK; index++) {
for (int32 g = 0; g < count; g++) {

2
src/kits/mail/NodeMessage.cpp
View File

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

4
src/servers/mail/NavMenu.h
View File

@ -142,7 +142,7 @@ protected:
// Spring Loaded Folder convenience routines
// used in both Tracker and Deskbar
#if B_BEOS_VERSION_DANO
#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
#define _IMPEXP_TRACKER
#endif
_IMPEXP_TRACKER bool SpringLoadedFolderCompareMessages(const BMessage *incoming,
@ -153,7 +153,7 @@ _IMPEXP_TRACKER void SpringLoadedFolderAddUniqueTypeToList(entry_ref *ref,
BObjectList<BString> *typeslist);
_IMPEXP_TRACKER void SpringLoadedFolderCacheDragData(const BMessage *incoming,
BMessage **, BObjectList<BString> **typeslist);
#if B_BEOS_VERSION_DANO
#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
#undef _IMPEXP_TRACKER
#endif