Changeset 24782

Timestamp:

04/03/08 15:09:36 (1 month ago)

Author:

bga

Message:

While tracking a mimeset bug when building under Haiku, I found these. Not sure
if these changes are correct byt they seem to make sense. Ingo?

- Haiku uses the same code that BeOS/Dano/Zeta uses for mime related stuff
  during the build process. Added checking for HAIKU_HOST_PLATFORM_HAIKU where
  relevant.

Files:

• haiku/trunk/src/build/libbe/storage/Mime.cpp (modified) (2 diffs)
• haiku/trunk/src/build/libbe/storage/mime/MimeUpdateThread.cpp (modified) (1 diff)
• haiku/trunk/src/build/libbe/storage/mime/UpdateMimeInfoThread.cpp (modified) (8 diffs)

haiku/trunk/src/build/libbe/storage/Mime.cpp

@@ -16 +16 @@
-#include <Messenger.h>
-#include <Mime.h>
-
+ && !defined(HAIKU_HOST_PLATFORM_HAIKU)
-#       include <MimeType.h>
-#endif
@@ -85 +85 @@
-        return B_OK;
-}
-

haiku/trunk/src/build/libbe/storage/mime/MimeUpdateThread.cpp

@@ -32 +32 @@
-namespace Storage {
-
-
+ || defined(HAIKU_HOST_PLATFORM_HAIKU)
-// device_is_root_device
-bool

haiku/trunk/src/build/libbe/storage/mime/UpdateMimeInfoThread.cpp

@@ -25 +25 @@
-#include <String.h>
-
-
+ && !defined(HAIKU_HOST_PLATFORM_HAIKU)
-#       include <MimeType.h>
-#else
@@ -57 +57 @@
-        else if (err == B_ENTRY_NOT_FOUND || err == B_NAME_NOT_FOUND) {
-                err = appFileInfoWrite.SetIconForType(type, NULL, iconSize);
-
+ || defined(HAIKU_HOST_PLATFORM_HAIKU)
-                // gives an error if the attribute didn't exist yet...
-                err = B_OK;
@@ -111 +111 @@
-
-
-
+ || defined(HAIKU_HOST_PLATFORM_HAIKU)
-// BMimeType::GuessMimeType() doesn't seem to work under BeOS
-status_t
@@ -221 +221 @@
-        if (!err && (updateType || updateAppInfo)) {
-                err = BMimeType::GuessMimeType(entry, &type);
-
+ || defined(HAIKU_HOST_PLATFORM_HAIKU)
-                if (err)
-                        err = guess_mime_type(entry, &type);
@@ -262 +262 @@
-                        // BeOS returns B_BAD_VALUE on shared libraries
-                        err = appFileInfoWrite.SetSignature(NULL);
-
+ || defined(HAIKU_HOST_PLATFORM_HAIKU)
-                        err = B_OK;
-#endif
@@ -289 +289 @@
-                        hasSupportedTypes = true;
-                } else if (err == B_ENTRY_NOT_FOUND || err == B_NAME_NOT_FOUND || err == B_BAD_VALUE) {
-
+ || defined(HAIKU_HOST_PLATFORM_HAIKU)
-                        file.RemoveAttr(kSupportedTypesAttr);
-                        err = B_OK;
@@ -334 +334 @@
-                                err = appFileInfoWrite.SetVersionInfo(&versionInfo, kind);
-                        else if (err == B_ENTRY_NOT_FOUND || err == B_NAME_NOT_FOUND || err == B_BAD_VALUE) {
-
+ && !defined(HAIKU_HOST_PLATFORM_HAIKU)
-                                // BeOS crashes when calling SetVersionInfo() with a NULL pointer
-                                err = appFileInfoWrite.SetVersionInfo(NULL, kind);
@@ -377 +377 @@
-}       // namespace Storage
-}       // namespace BPrivate
-