From 32fe1bd1bfcaa2c96cd407c3d1e20f2d4000bd0b Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Mon, 28 Jan 2008 01:11:37 +0000
Subject: [PATCH] Replace accidentally checked in files with previous ones.

svn path=/trunk/netsurf/; revision=3786
---
 !NetSurf/!Run,feb    |  2 +-
 makefile             | 30 ++++++++++++++----------------
 render/html_redraw.c |  6 ------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/!NetSurf/!Run,feb b/!NetSurf/!Run,feb
index 156435039..7828c21fc 100644
--- a/!NetSurf/!Run,feb
+++ b/!NetSurf/!Run,feb
@@ -99,7 +99,7 @@ CDir <Wimp$ScrapDir>.WWW.NetSurf
 | NB: trailing dot is required
 FontInstall NetSurf:Resources.Fonts.
 
-WimpSlot -min 3540k -max 3540k
+WimpSlot -min 2240k -max 2240k
 Run <NetSurf$Dir>.!RunImage -v %*0 2><Wimp$ScrapDir>.WWW.NetSurf.Log
 
 | Uninstall NetSurf-specific fonts
diff --git a/makefile b/makefile
index 4298c57db..cd1224480 100644
--- a/makefile
+++ b/makefile
@@ -72,23 +72,8 @@ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \
 	gtk_history.o gtk_window.o gtk_filetype.o \
 	gtk_download.o						# gtk/
 
-# Default target - platform specific files may specify special-case rules for
-# various files.
-default: riscos
 
-
-# Inclusion of platform specific files has to occur after the OBJDIR stuff as
-# that is referred to in the files
-
-OS = riscos
-ifeq ($(OS),riscos)
-include riscos.mk
-else
-include posix.mk
-endif
-
-
-OBJDIR_RISCOS = arm-riscos-aof
+OBJDIR_RISCOS = $(shell $(CC) -dumpmachine)
 SOURCES_RISCOS=$(OBJECTS_RISCOS:.o=.c)
 OBJS_RISCOS=$(OBJECTS_RISCOS:%.o=$(OBJDIR_RISCOS)/%.o)
 
@@ -106,6 +91,19 @@ OBJDIR_GTK = objects-gtk
 SOURCES_GTK=$(OBJECTS_GTK:.o=.c)
 OBJS_GTK=$(OBJECTS_GTK:%.o=$(OBJDIR_GTK)/%.o)
 
+# Default target - platform specific files may specify special-case rules for
+# various files.
+default: riscos
+
+# Inclusion of platform specific files has to occur after the OBJDIR stuff as
+# that is referred to in the files
+
+OS = $(word 2,$(subst -, ,$(shell $(SYSTEM_CC) -dumpmachine)))
+ifeq ($(OS),riscos)
+include riscos.mk
+else
+include posix.mk
+endif
 
 VPATH = content:content/fetchers:css:desktop:image:render:riscos:riscos/configure:riscos/gui:utils:debug:gtk
 
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 6ad5f8c47..52b33190a 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -1305,12 +1305,6 @@ bool html_redraw_background(int x, int y, struct box *box, float scale,
 		if (plot_content) {
 			if (!plot.clip(clip_x0, clip_y0, clip_x1, clip_y1))
 					return false;
-		if ((repeat_x || repeat_y) && (!(repeat_x && repeat_y))) {
-			clip_x0 += ceilf(box->border[LEFT] * scale);
-			clip_x1 -= ceilf(box->border[RIGHT] * scale);
-			clip_y0 += ceilf(box->border[TOP] * scale);
-			clip_y1 -= ceilf(box->border[BOTTOM] * scale);
-		}
 			if (!content_redraw_tiled(background->background, x, y,
 				ceilf(background->background->width * scale),
 				ceilf(background->background->height * scale),