| 1 | Index: configure |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- configure (revision 35712) |
|---|
| 4 | +++ configure (working copy) |
|---|
| 5 | -1052,11 +1052,23 @@ |
|---|
| 6 | beos*) |
|---|
| 7 | DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE" |
|---|
| 8 | # Needs -lbind -lsocket for the timidity MIDI driver |
|---|
| 9 | + LDFLAGS="-L/boot/home/config/lib" |
|---|
| 10 | + CFLAGS="-I/boot/home/config/include" |
|---|
| 11 | + CXXFLAGS="$CXXFLAGS -fhuge-objects" |
|---|
| 12 | LIBS="$LIBS -lbind -lsocket" |
|---|
| 13 | type_1_byte='char' |
|---|
| 14 | type_2_byte='short' |
|---|
| 15 | type_4_byte='long' |
|---|
| 16 | ;; |
|---|
| 17 | + haiku*) |
|---|
| 18 | + DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE" |
|---|
| 19 | + # Needs -lnetwork for the timidity MIDI driver |
|---|
| 20 | + LIBS="$LIBS -lnetwork" |
|---|
| 21 | + CXXFLAGS="$CXXFLAGS -fhuge-objects" |
|---|
| 22 | + type_1_byte='char' |
|---|
| 23 | + type_2_byte='short' |
|---|
| 24 | + type_4_byte='long' |
|---|
| 25 | + ;; |
|---|
| 26 | solaris*) |
|---|
| 27 | DEFINES="$DEFINES -DUNIX -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE" |
|---|
| 28 | # Needs -lbind -lsocket for the timidity MIDI driver |
|---|
| 29 | Index: gui/ThemeData.h |
|---|
| 30 | =================================================================== |
|---|
| 31 | --- gui/ThemeData.h (revision 35712) |
|---|
| 32 | +++ gui/ThemeData.h (working copy) |
|---|
| 33 | -27,6 +27,7 @@ |
|---|
| 34 | #define GUI_THEME_DATA_H |
|---|
| 35 | |
|---|
| 36 | #include "gui/ThemeEngine.h" |
|---|
| 37 | +#include "graphics/VectorRenderer.h" |
|---|
| 38 | |
|---|
| 39 | namespace GUI { |
|---|
| 40 | |
|---|
| 41 | Index: config.guess |
|---|
| 42 | =================================================================== |
|---|
| 43 | --- config.guess (revision 35712) |
|---|
| 44 | +++ config.guess (working copy) |
|---|
| 45 | -1206,6 +1206,9 @@ |
|---|
| 46 | BePC:BeOS:*:*) # BeOS running on Intel PC compatible. |
|---|
| 47 | echo i586-pc-beos |
|---|
| 48 | exit ;; |
|---|
| 49 | + BePC:Haiku:*:*) # BeOS running on Intel PC compatible. |
|---|
| 50 | + echo i586-pc-haiku |
|---|
| 51 | + exit ;; |
|---|
| 52 | SX-4:SUPER-UX:*:*) |
|---|
| 53 | echo sx4-nec-superux${UNAME_RELEASE} |
|---|
| 54 | exit ;; |
|---|
| 55 | Index: config.sub |
|---|
| 56 | =================================================================== |
|---|
| 57 | --- config.sub (revision 35712) |
|---|
| 58 | +++ config.sub (working copy) |
|---|
| 59 | -1559,6 +1559,9 @@ |
|---|
| 60 | -beos*) |
|---|
| 61 | vendor=be |
|---|
| 62 | ;; |
|---|
| 63 | + -haiku*) |
|---|
| 64 | + vendor=haiku |
|---|
| 65 | + ;; |
|---|
| 66 | -hpux*) |
|---|
| 67 | vendor=hp |
|---|
| 68 | ;; |
|---|
| 69 | Index: graphics/scaler/hq2x_i386.asm |
|---|
| 70 | =================================================================== |
|---|
| 71 | --- graphics/scaler/hq2x_i386.asm (revision 35712) |
|---|
| 72 | +++ graphics/scaler/hq2x_i386.asm (working copy) |
|---|
| 73 | -1841,7 +1841,7 @@ |
|---|
| 74 | dd ..@flag0, ..@flag0, ..@flag0, ..@flag0 |
|---|
| 75 | |
|---|
| 76 | |
|---|
| 77 | -%ifidn __OUTPUT_FORMAT__,elf |
|---|
| 78 | -section .note.GNU-stack noalloc noexec nowrite progbits |
|---|
| 79 | -%endif |
|---|
| 80 | +# %ifidn __OUTPUT_FORMAT__,elf |
|---|
| 81 | +# section .note.GNU-stack noalloc noexec nowrite progbits |
|---|
| 82 | +# %endif |
|---|
| 83 | |
|---|
| 84 | Index: graphics/scaler/hq3x_i386.asm |
|---|
| 85 | =================================================================== |
|---|
| 86 | --- graphics/scaler/hq3x_i386.asm (revision 35712) |
|---|
| 87 | +++ graphics/scaler/hq3x_i386.asm (working copy) |
|---|
| 88 | -2433,7 +2433,7 @@ |
|---|
| 89 | dd ..@flag0, ..@flag0, ..@flag0, ..@flag0 |
|---|
| 90 | |
|---|
| 91 | |
|---|
| 92 | -%ifidn __OUTPUT_FORMAT__,elf |
|---|
| 93 | -section .note.GNU-stack noalloc noexec nowrite progbits |
|---|
| 94 | -%endif |
|---|
| 95 | +# %ifidn __OUTPUT_FORMAT__,elf |
|---|
| 96 | +# section .note.GNU-stack noalloc noexec nowrite progbits |
|---|
| 97 | +# %endif |
|---|
| 98 | |
|---|
| 99 | Index: graphics/surface.h |
|---|
| 100 | =================================================================== |
|---|
| 101 | --- graphics/surface.h (revision 35712) |
|---|
| 102 | +++ graphics/surface.h (working copy) |
|---|
| 103 | -47,7 +47,7 @@ |
|---|
| 104 | Surface() : w(0), h(0), pitch(0), pixels(0), bytesPerPixel(0) {} |
|---|
| 105 | |
|---|
| 106 | inline const void *getBasePtr(int x, int y) const { |
|---|
| 107 | - return static_cast<const byte *>(pixels) + y * pitch + x * bytesPerPixel; |
|---|
| 108 | + return (const byte *)(pixels) + y * pitch + x * bytesPerPixel; |
|---|
| 109 | } |
|---|
| 110 | |
|---|
| 111 | inline void *getBasePtr(int x, int y) { |
|---|
