diff options
| author | Adrien Destugues <pulkomandy@pulkomandy.tk> | 2015-08-17 20:09:47 +0200 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-10-12 21:08:25 +0100 |
| commit | 2071c2a91b5f8647d95ffc95e524657bff8089d9 (patch) | |
| tree | 2de759d980e060d28822e72420fd9920e7eb205e /beos | |
| parent | 46ff49baef23b4fff4eda0925793880b3d0eeaf5 (diff) | |
| download | netsurf-2071c2a91b5f8647d95ffc95e524657bff8089d9.tar.gz netsurf-2071c2a91b5f8647d95ffc95e524657bff8089d9.tar.bz2 | |
Fix BeOS build
Mainly C/C++ conflicts:
* Designated initializer are not part of C++
* C++ already defines min() and max()
* Force C99 and remove -O0 since we now use a decent compiler
Diffstat (limited to 'beos')
| -rw-r--r-- | beos/Makefile.target | 4 | ||||
| -rw-r--r-- | beos/bitmap.cpp | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/beos/Makefile.target b/beos/Makefile.target index 23d8ccb12..99035128c 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -16,8 +16,8 @@ LDFLAGS += -lexpat -lcurl COMMON_WARNFLAGS += -Wno-multichar # compiler flags -CFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g -O0 -CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g -O0 +CFLAGS += -std=c99 -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g +CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g BEOS_BERES := beres BEOS_RC := rc diff --git a/beos/bitmap.cpp b/beos/bitmap.cpp index 3228770a4..b39da7cd4 100644 --- a/beos/bitmap.cpp +++ b/beos/bitmap.cpp @@ -538,19 +538,19 @@ static nserror bitmap_render(struct bitmap *bitmap, hlcache_handle *content) static struct gui_bitmap_table bitmap_table = { - .create = bitmap_create, - .destroy = bitmap_destroy, - .set_opaque = bitmap_set_opaque, - .get_opaque = bitmap_get_opaque, - .test_opaque = bitmap_test_opaque, - .get_buffer = bitmap_get_buffer, - .get_rowstride = bitmap_get_rowstride, - .get_width = bitmap_get_width, - .get_height = bitmap_get_height, - .get_bpp = bitmap_get_bpp, - .save = bitmap_save, - .modified = bitmap_modified, - .render = bitmap_render, + /*.create =*/ bitmap_create, + /*.destroy =*/ bitmap_destroy, + /*.set_opaque =*/ bitmap_set_opaque, + /*.get_opaque =*/ bitmap_get_opaque, + /*.test_opaque =*/ bitmap_test_opaque, + /*.get_buffer =*/ bitmap_get_buffer, + /*.get_rowstride =*/ bitmap_get_rowstride, + /*.get_width =*/ bitmap_get_width, + /*.get_height =*/ bitmap_get_height, + /*.get_bpp =*/ bitmap_get_bpp, + /*.save =*/ bitmap_save, + /*.modified =*/ bitmap_modified, + /*.render =*/ bitmap_render, }; struct gui_bitmap_table *beos_bitmap_table = &bitmap_table; |