summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--beos/beos_gui.cpp2
-rw-r--r--beos/beos_plotters.cpp2
-rw-r--r--beos/beos_thumbnail.cpp7
3 files changed, 6 insertions, 5 deletions
diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp
index 28096c3a7..b757c9790 100644
--- a/beos/beos_gui.cpp
+++ b/beos/beos_gui.cpp
@@ -45,7 +45,7 @@ extern "C" {
#include "content/content.h"
#include "content/content_protected.h"
#include "content/fetch.h"
-#include "content/fetchers/fetch_curl.h"
+#include "content/fetchers/curl.h"
#include "content/urldb.h"
#include "desktop/401login.h"
#include "desktop/browser.h"
diff --git a/beos/beos_plotters.cpp b/beos/beos_plotters.cpp
index 8c65d7ac3..1d4baedb0 100644
--- a/beos/beos_plotters.cpp
+++ b/beos/beos_plotters.cpp
@@ -66,7 +66,7 @@ static bool nsbeos_plot_line(int x0, int y0, int x1, int y1, const plot_style_t
static bool nsbeos_plot_polygon(const int *p, unsigned int n, const plot_style_t *style);
static bool nsbeos_plot_path(const float *p, unsigned int n, colour fill, float width,
colour c, const float transform[6]);
-static bool nsbeos_plot_clip(const struct clip *rect);
+static bool nsbeos_plot_clip(const struct rect *ns_clip);
static bool nsbeos_plot_text(int x, int y, const char *text, size_t length,
const plot_font_style_t *fstyle);
static bool nsbeos_plot_disc(int x, int y, int radius, const plot_style_t *style);
diff --git a/beos/beos_thumbnail.cpp b/beos/beos_thumbnail.cpp
index 62b60175d..881d5a071 100644
--- a/beos/beos_thumbnail.cpp
+++ b/beos/beos_thumbnail.cpp
@@ -26,6 +26,7 @@
#define __STDBOOL_H__ 1
#include <assert.h>
+#include <sys/param.h>
#include <Bitmap.h>
#include <View.h>
extern "C" {
@@ -79,8 +80,8 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
height = thumbnail->Bounds().Height();
depth = 32;
- big_width = min(content_get_width(content), 1024);
- big_height = ((big_width * height) + (width / 2)) / width;
+ big_width = MIN(content_get_width(content), 1024);
+ big_height = (int)(((big_width * height) + (width / 2)) / width);
BRect contentRect(0, 0, big_width - 1, big_height - 1);
big = new BBitmap(contentRect, B_BITMAP_ACCEPTS_VIEWS, B_RGB32);
@@ -117,7 +118,7 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
nsbeos_current_gc_set(view);
plot = nsbeos_plotters;
- plot_scale = thumbnail_get_redraw_scale(content, big_width)
+ plot_scale = thumbnail_get_redraw_scale(content, big_width);
nsbeos_plot_set_scale(plot_scale);
/* render the content */