summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--beos/Makefile.target4
-rw-r--r--beos/bitmap.cpp26
-rw-r--r--utils/utils.h2
3 files changed, 17 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;
diff --git a/utils/utils.h b/utils/utils.h
index 3fec34aa1..e4688ce2c 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -59,6 +59,7 @@ struct dirent;
#undef max
#endif
+#ifndef __cplusplus
#ifndef min
#define min(x,y) (((x)<(y))?(x):(y))
#endif
@@ -66,6 +67,7 @@ struct dirent;
#ifndef max
#define max(x,y) (((x)>(y))?(x):(y))
#endif
+#endif
#ifndef PRIxPTR
#define PRIxPTR "x"