diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-04-16 17:49:27 +0100 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-04-16 17:49:27 +0100 |
commit | 7e0ed132f7d3edb1681badc1fadaf5a0812d7768 (patch) | |
tree | 3eef8e12bdb5fc133a7a03fed59d444b4ee6b5c7 /frontends/amiga/stringview | |
parent | 9a8577feadd13d0634f773953096a0ec3e7cb1eb (diff) | |
download | netsurf-7e0ed132f7d3edb1681badc1fadaf5a0812d7768.tar.gz netsurf-7e0ed132f7d3edb1681badc1fadaf5a0812d7768.tar.bz2 |
Adjust the requested class versions to be the minimum required.
Some features of later versions are used but are either restricted to OS4 only, or runtime version checks select the appropriate routines.
Where the lowest required version cannot be determined, the version provided in the ClassAct 3.3 archive is requested.
Bugs may mean these older classes do not work as expected.
In addition, restrict the opening of listbrowser.gadget and the custom Stringview class to OS4 only.
Diffstat (limited to 'frontends/amiga/stringview')
-rwxr-xr-x | frontends/amiga/stringview/stringview.c | 3 | ||||
-rwxr-xr-x | frontends/amiga/stringview/stringview.h | 5 | ||||
-rw-r--r-- | frontends/amiga/stringview/urlhistory.c | 3 | ||||
-rw-r--r-- | frontends/amiga/stringview/urlhistory.h | 5 |
4 files changed, 14 insertions, 2 deletions
diff --git a/frontends/amiga/stringview/stringview.c b/frontends/amiga/stringview/stringview.c index e875f3b5a..245782b43 100755 --- a/frontends/amiga/stringview/stringview.c +++ b/frontends/amiga/stringview/stringview.c @@ -17,6 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef __amigaos4__ /// Include #include <proto/dos.h> @@ -32,7 +33,6 @@ #include <gadgets/layout.h> #include <gadgets/listbrowser.h> -#include "amiga/os3support.h" #include "amiga/libs.h" #include "stringview.h" @@ -867,4 +867,5 @@ void FreeStringClass(Class *cl) /// /* The End */ +#endif //__amigaos4__ diff --git a/frontends/amiga/stringview/stringview.h b/frontends/amiga/stringview/stringview.h index f989b2a0f..776705f0f 100755 --- a/frontends/amiga/stringview/stringview.h +++ b/frontends/amiga/stringview/stringview.h @@ -17,7 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "amiga/os3support.h" +#ifndef AMIGA_STRINGVIEW_H +#define AMIGA_STRINGVIEW_H 1 #include <exec/semaphores.h> #include <intuition/classes.h> @@ -58,3 +59,5 @@ void FreeStringClass(Class *); #ifdef __cplusplus } #endif +#endif + diff --git a/frontends/amiga/stringview/urlhistory.c b/frontends/amiga/stringview/urlhistory.c index 7405fbb57..c1e37ea7e 100644 --- a/frontends/amiga/stringview/urlhistory.c +++ b/frontends/amiga/stringview/urlhistory.c @@ -18,6 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef __amigaos4__ #include <stdio.h> #include <ctype.h> #include <string.h> @@ -123,3 +124,5 @@ void URLHistory_AddPage( const char * urlString ) urldb_iterate_partial(urlString, URLHistoryFound); } } +#endif //__amigaos4__ + diff --git a/frontends/amiga/stringview/urlhistory.h b/frontends/amiga/stringview/urlhistory.h index b72792db4..962713e9e 100644 --- a/frontends/amiga/stringview/urlhistory.h +++ b/frontends/amiga/stringview/urlhistory.h @@ -17,6 +17,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef AMIGA_URLHISTORY_H +#define AMIGA_URLHISTORY_H 1 + #ifdef __cplusplus extern "C" { #endif @@ -31,3 +34,5 @@ void URLHistory_AddPage( const char * urlString ); #ifdef __cplusplus } #endif +#endif + |