Hopefully fixed the build when not using Message4. As Message4 works well and is less broken than the older implementation we should maybe switch to it completely.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16461 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+10
-6
@@ -1171,6 +1171,7 @@ BLooper::ConvertToMessage(void *buffer, int32 code)
|
|||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
BMessage *message = new BMessage();
|
BMessage *message = new BMessage();
|
||||||
|
#ifdef USING_MESSAGE4
|
||||||
if (code == kPortMessageCodeByArea) {
|
if (code == kPortMessageCodeByArea) {
|
||||||
BMessage::Private messagePrivate(message);
|
BMessage::Private messagePrivate(message);
|
||||||
if (messagePrivate.Reference((BMessage::message_header *)buffer) != B_OK) {
|
if (messagePrivate.Reference((BMessage::message_header *)buffer) != B_OK) {
|
||||||
@@ -1178,12 +1179,15 @@ BLooper::ConvertToMessage(void *buffer, int32 code)
|
|||||||
delete message;
|
delete message;
|
||||||
message = NULL;
|
message = NULL;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
if (message->Unflatten((const char *)buffer) != B_OK) {
|
return message;
|
||||||
PRINT(("BLooper::ConvertToMessage(): unflattening message failed\n"));
|
}
|
||||||
delete message;
|
#endif
|
||||||
message = NULL;
|
|
||||||
}
|
if (message->Unflatten((const char *)buffer) != B_OK) {
|
||||||
|
PRINT(("BLooper::ConvertToMessage(): unflattening message failed\n"));
|
||||||
|
delete message;
|
||||||
|
message = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
PRINT(("BLooper::ConvertToMessage(): %p\n", message));
|
PRINT(("BLooper::ConvertToMessage(): %p\n", message));
|
||||||
|
|||||||
Reference in New Issue
Block a user