Diff of /libs/scroller/Scroller_includes.h [8ad880] .. [de1f76] Maximize Restore

  Switch to side-by-side view

--- a/libs/scroller/Scroller_includes.h
+++ b/libs/scroller/Scroller_includes.h
@@ -5,13 +5,19 @@
 #ifndef SCROLLER_INCLUDES_H
 #define SCROLLER_INCLUDES_H
 
+
 #define INTUI_V36_NAMES_ONLY
-#define __USE_SYSBASE
 
-#define SysBase cb->cb_SysBase
-#define IntuitionBase cb->cb_IntuitionBase
-#define GfxBase cb->cb_GfxBase
-#define UtilityBase cb->cb_UtilityBase
+#if defined(__SASC)
+#	define __USE_SYSBASE
+
+#	define SysBase cb->cb_SysBase
+#	define IntuitionBase cb->cb_IntuitionBase
+#	define GfxBase cb->cb_GfxBase
+#	define UtilityBase cb->cb_UtilityBase
+#endif
+
+#include "SDI_compiler.h"
 
 #include <exec/execbase.h>
 #include <exec/libraries.h>
@@ -29,27 +35,22 @@
 #include <gadgets/Scroller.h>
 #include <dos/dos.h>
 
-#include <clib/exec_protos.h>
-#include <clib/intuition_protos.h>
-#include <clib/graphics_protos.h>
-#include <clib/utility_protos.h>
+#include <proto/exec.h>
+#include <proto/intuition.h>
+#include <proto/graphics.h>
+#include <proto/utility.h>
 
-#include <pragmas/exec_pragmas.h>
-#include <pragmas/intuition_pragmas.h>
-#include <pragmas/graphics_pragmas.h>
-#include <pragmas/utility_pragmas.h>
+#if defined(__SASC)
+#	include <pragmas/exec_pragmas.h>
+#	include <pragmas/intuition_pragmas.h>
+#	include <pragmas/graphics_pragmas.h>
+#	include <pragmas/utility_pragmas.h>
+#endif
 
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 #include <math.h>
-
-#define PUBLIC __asm __saveds
-#define PRIVATE __regargs
-#define reg(x) register __ ## x
-
-extern void kprintf(STRPTR,...);
-#define bug kprintf
 
 #define ID_FTXT  MAKE_ID('F','T','X','T')
 #define ID_CHRS  MAKE_ID('C','H','R','S')
@@ -101,9 +102,8 @@
 extern void PRIVATE SC_Exit(struct ClassBase *cb);
 
 /** public functions **/
-
-extern Class * PUBLIC GetClass(reg (a6) APTR classbase);
-extern ULONG PUBLIC DispatchScrollerGadget(reg (a0) Class *cl,reg (a2) Object *o,reg (a1) Msg msg);
-extern ULONG PUBLIC DispatchArrowImage(reg (a0) Class *cl,reg (a2) Object *o,reg (a1) Msg msg);
+extern Class * PUBLIC GetClass(REG(a6, APTR classbase));
+extern IPTR PUBLIC DispatchScrollerGadget(REG(a0, Class *cl),REG(a2, Object *o),REG(a1, Msg msg));
+extern IPTR PUBLIC DispatchArrowImage(REG(a0, Class *cl),REG(a2,Object *o),REG(a1, Msg msg));
 
 #endif    // SCROLLER_INCLUDES_H