Re: [AD] time for 4.4.2?

[scottmc <scottmc2@xxxxxxxxxx>]

>
> I'll check it on Haiku this weekend.
> -scottmc
>

Attached is a patch that allows the 4.4.x svn branch to build on Haiku.
Also I get a lot of warnings like this:

cc1: warning: command line option "-Wno-ctor-dtor-privacy" is valid
for C++/ObjC++ but not for C

-scottmc

Patch is pasted here in case the list strips attachments, also
attempted to attach, use whichever is easier to apply.  Note that of
the 4 files only one is a none BeOS/Haiku only file and it's is
ifdef'd, so this patch shouldn't affect other platforms.
------------------
Index: src/beos/bwscreen.cpp
===================================================================
--- src/beos/bwscreen.cpp	(revision 14630)
+++ src/beos/bwscreen.cpp	(working copy)
@@ -363,9 +363,9 @@

 #ifdef ALLEGRO_NO_ASM
    if (gfx_capabilities) {
-      bmp->write_bank = be_gfx_bwindowscreen_read_write_bank;
-      bmp->read_bank  = be_gfx_bwindowscreen_read_write_bank;
-      _screen_vtable.unwrite_bank = be_gfx_bwindowscreen_unwrite_bank;
+      bmp->write_bank = (void *)be_gfx_bwindowscreen_read_write_bank;
+      bmp->read_bank  = (void *)be_gfx_bwindowscreen_read_write_bank;
+      _screen_vtable.unwrite_bank = (void *)be_gfx_bwindowscreen_unwrite_bank;
    }
 #else
    if (gfx_capabilities) {
Index: src/beos/bdwindow.cpp
===================================================================
--- src/beos/bdwindow.cpp	(revision 14630)
+++ src/beos/bdwindow.cpp	(working copy)
@@ -413,9 +413,9 @@
    }

 #ifdef ALLEGRO_NO_ASM
-   bmp->read_bank = _be_gfx_bwindow_read_write_bank;
-   bmp->write_bank = _be_gfx_bwindow_read_write_bank;
-   _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank;
+    bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank;
+    bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank;
+    _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank;
 #else
    bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm;
    bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm;
Index: src/beos/bwindow.cpp
===================================================================
--- src/beos/bwindow.cpp	(revision 14630)
+++ src/beos/bwindow.cpp	(working copy)
@@ -347,9 +347,9 @@
    }

 #ifdef ALLEGRO_NO_ASM
-   bmp->read_bank = _be_gfx_bwindow_read_write_bank;
-   bmp->write_bank = _be_gfx_bwindow_read_write_bank;
-   _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank;
+   bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank;
+   bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank;
+   _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank;
 #else
    bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm;
    bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm;
Index: src/file.c
===================================================================
--- src/file.c	(revision 14630)
+++ src/file.c	(working copy)
@@ -43,6 +43,9 @@
    #include "winalleg.h" /* for GetTempPath */
 #endif

+#ifndef O_BINARY
+   #define O_BINARY  0
+#endif

 /* permissions to use when opening files */
 #ifndef ALLEGRO_MPW

Attachment: allegro-4.4-haiku.diff
Description: Binary data