From ee749f2b11276533f3c7fd139bb96f69103ae08f Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sat, 10 Jun 2017 21:46:47 +0100
Subject: cleanup use of internal frames scrollbar widget header

---
 desktop/scrollbar.h       | 10 ++++++----
 frontends/amiga/gui.c     |  7 ++++++-
 frontends/riscos/window.c |  7 ++++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/desktop/scrollbar.h b/desktop/scrollbar.h
index f7153318f..fa5e167f2 100644
--- a/desktop/scrollbar.h
+++ b/desktop/scrollbar.h
@@ -19,6 +19,8 @@
 /**
  * \file
  * Scrollbar widget interface.
+ *
+ * Scrollbar widgets used in frames code, not for frontend use
  */
 
 #ifndef NETSURF_DESKTOP_SCROLLBAR_H
@@ -30,10 +32,10 @@
 #define SCROLLBAR_WIDTH 16
 
 /* Region dependent values for scrollbar_scroll function */
-#define SCROLL_TOP		INT_MIN
-#define SCROLL_PAGE_UP		INT_MIN + 1
-#define SCROLL_PAGE_DOWN	INT_MAX - 1
-#define SCROLL_BOTTOM		INT_MAX
+#define SCROLL_TOP	 INT_MIN
+#define SCROLL_PAGE_UP	 (INT_MIN + 1)
+#define SCROLL_PAGE_DOWN (INT_MAX - 1)
+#define SCROLL_BOTTOM	 INT_MAX
 
 struct scrollbar;
 
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 2d5a27cb5..5c6700a68 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -90,6 +90,7 @@
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
+#include <limits.h>
 
 /* NetSurf core includes */
 #include "utils/log.h"
@@ -115,7 +116,6 @@
 #include "desktop/hotlist.h"
 #include "desktop/version.h"
 #include "desktop/save_complete.h"
-#include "desktop/scrollbar.h"
 #include "desktop/searchweb.h"
 
 /* NetSurf Amiga platform includes */
@@ -158,6 +158,11 @@
 #define NSA_KBD_SCROLL_PX 10
 #define NSA_MAX_HOTLIST_BUTTON_LEN 20
 
+#define SCROLL_TOP INT_MIN
+#define SCROLL_PAGE_UP (INT_MIN + 1)
+#define SCROLL_PAGE_DOWN (INT_MAX - 1)
+#define SCROLL_BOTTOM (INT_MAX)
+
 /* Extra mouse button defines to match those in intuition/intuition.h */
 #define SIDEDOWN  (IECODE_4TH_BUTTON)
 #define SIDEUP    (IECODE_4TH_BUTTON | IECODE_UP_PREFIX)
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index 4fb404e34..c8271065a 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -35,6 +35,7 @@
 #include <stdint.h>
 #include <time.h>
 #include <string.h>
+#include <limits.h>
 #include <oslib/colourtrans.h>
 #include <oslib/osbyte.h>
 #include <oslib/osfile.h>
@@ -63,7 +64,6 @@
 #include "netsurf/keypress.h"
 #include "desktop/browser_history.h"
 #include "desktop/cookie_manager.h"
-#include "desktop/scrollbar.h"
 
 #include "riscos/bitmap.h"
 #include "riscos/buffer.h"
@@ -167,6 +167,11 @@ static void ro_gui_window_process_form_select_menu(struct gui_window *g,
 
 #define SCROLL_VISIBLE_PADDING 32
 
+#define SCROLL_TOP INT_MIN
+#define SCROLL_PAGE_UP (INT_MIN + 1)
+#define SCROLL_PAGE_DOWN (INT_MAX - 1)
+#define SCROLL_BOTTOM INT_MAX
+
 /** Remembers which iconised sprite numbers are in use */
 static bool iconise_used[64];
 static int iconise_next = 0;
-- 
cgit v1.2.3