r11155 jmb - in /trunk/netsurf/amiga: arexx.c download.h gui.h history_local.c login.c os3support.h schedule.c schedule.h search.c stringview/stringview.c stringview/stringview.h stringview/urlhistory.c tree.c tree.h

netsurf at semichrome.net netsurf at semichrome.net
Thu Dec 30 00:53:11 GMT 2010


Author: jmb
Date: Wed Dec 29 18:53:11 2010
New Revision: 11155

URL: http://source.netsurf-browser.org?rev=11155&view=rev
Log:
First pass of AmigaOS 3 compatibility

Added:
    trunk/netsurf/amiga/os3support.h
Modified:
    trunk/netsurf/amiga/arexx.c
    trunk/netsurf/amiga/download.h
    trunk/netsurf/amiga/gui.h
    trunk/netsurf/amiga/history_local.c
    trunk/netsurf/amiga/login.c
    trunk/netsurf/amiga/schedule.c
    trunk/netsurf/amiga/schedule.h
    trunk/netsurf/amiga/search.c
    trunk/netsurf/amiga/stringview/stringview.c
    trunk/netsurf/amiga/stringview/stringview.h
    trunk/netsurf/amiga/stringview/urlhistory.c
    trunk/netsurf/amiga/tree.c
    trunk/netsurf/amiga/tree.h

Modified: trunk/netsurf/amiga/arexx.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/arexx.c?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/arexx.c (original)
+++ trunk/netsurf/amiga/arexx.c Wed Dec 29 18:53:11 2010
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "amiga/os3support.h"
+
 #include "arexx.h"
 #include <reaction/reaction_macros.h>
 #include <string.h>

Modified: trunk/netsurf/amiga/download.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.h?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/download.h (original)
+++ trunk/netsurf/amiga/download.h Wed Dec 29 18:53:11 2010
@@ -18,6 +18,9 @@
 
 #ifndef AMIGA_DOWNLOAD_H
 #define AMIGA_DOWNLOAD_H
+
+#include "amiga/os3support.h"
+
 #include "amiga/gui.h"
 
 struct download_context;

Modified: trunk/netsurf/amiga/gui.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.h?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/gui.h (original)
+++ trunk/netsurf/amiga/gui.h Wed Dec 29 18:53:11 2010
@@ -25,6 +25,7 @@
 #include <dos/dos.h>
 #include <devices/inputevent.h>
 #include "desktop/gui.h"
+#include "amiga/os3support.h"
 #include "amiga/plotters.h"
 #include "amiga/menu.h"
 

Modified: trunk/netsurf/amiga/history_local.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/history_local.c?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/history_local.c (original)
+++ trunk/netsurf/amiga/history_local.c Wed Dec 29 18:53:11 2010
@@ -27,6 +27,7 @@
 #include <string.h>
 #include "desktop/history_core.h"
 #include "desktop/plotters.h"
+#include "amiga/os3support.h"
 #include "amiga/object.h"
 #include "amiga/gui.h"
 #include "utils/log.h"

Modified: trunk/netsurf/amiga/login.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/login.c?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/login.c (original)
+++ trunk/netsurf/amiga/login.c Wed Dec 29 18:53:11 2010
@@ -17,6 +17,7 @@
  */
 
 #include "desktop/401login.h"
+#include "amiga/os3support.h"
 #include "amiga/gui.h"
 #include "amiga/object.h"
 #include "amiga/login.h"

Added: trunk/netsurf/amiga/os3support.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/os3support.h?rev=11155&view=auto
==============================================================================
--- trunk/netsurf/amiga/os3support.h (added)
+++ trunk/netsurf/amiga/os3support.h Wed Dec 29 18:53:11 2010
@@ -1,0 +1,57 @@
+/*
+ * Copyright 2010 John-Mark Bell <jmb at netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * Minimal compatibility header for AmigaOS 3
+ */
+
+#ifndef AMIGA_OS3SUPPORT_H_
+#define AMIGA_OS3SUPPORT_H_
+
+#ifndef __amigaos4__
+
+#include <stdint.h>
+
+/* Include prototypes for amigalib */
+#include <clib/alib_protos.h>
+
+#ifndef EXEC_MEMORY_H
+#include <exec/memory.h>
+#endif
+
+/* Define extra memory type flags */
+#define MEMF_PRIVATE	MEMF_ANY
+#define MEMF_SHARED	MEMF_ANY
+
+/* Integral type definitions */
+typedef int8_t int8;
+typedef uint8_t uint8;
+typedef int16_t int16;
+typedef uint16_t uint16;
+typedef int32_t int32;
+typedef uint32_t uint32;
+
+/* TimeVal */
+struct TimeVal {
+	uint32 Seconds;
+	uint32 Microseconds;
+};
+
+#endif
+
+#endif

Modified: trunk/netsurf/amiga/schedule.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/schedule.c?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/schedule.c (original)
+++ trunk/netsurf/amiga/schedule.c Wed Dec 29 18:53:11 2010
@@ -17,6 +17,7 @@
  */
 
 #include "desktop/browser.h"
+#include "amiga/os3support.h"
 #include "amiga/object.h"
 #include "amiga/schedule.h"
 #include <proto/exec.h>

Modified: trunk/netsurf/amiga/schedule.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/schedule.h?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/schedule.h (original)
+++ trunk/netsurf/amiga/schedule.h Wed Dec 29 18:53:11 2010
@@ -21,6 +21,8 @@
 #include <exec/lists.h>
 #include <proto/timer.h>
 
+#include "amiga/os3support.h"
+
 struct MinList *schedule_list;
 struct TimeRequest *tioreq;
 struct MsgPort *msgport;

Modified: trunk/netsurf/amiga/search.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/search.c?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/search.c (original)
+++ trunk/netsurf/amiga/search.c Wed Dec 29 18:53:11 2010
@@ -35,6 +35,7 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "amiga/os3support.h"
 #include "amiga/search.h"
 #include "amiga/object.h"
 #include <proto/intuition.h>

Modified: trunk/netsurf/amiga/stringview/stringview.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/stringview/stringview.c?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/stringview/stringview.c (original)
+++ trunk/netsurf/amiga/stringview/stringview.c Wed Dec 29 18:53:11 2010
@@ -31,6 +31,8 @@
 #include <classes/window.h>
 #include <gadgets/layout.h>
 #include <gadgets/listbrowser.h>
+
+#include "amiga/os3support.h"
 
 #include "stringview.h"
 #include "urlhistory.h"

Modified: trunk/netsurf/amiga/stringview/stringview.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/stringview/stringview.h?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/stringview/stringview.h (original)
+++ trunk/netsurf/amiga/stringview/stringview.h Wed Dec 29 18:53:11 2010
@@ -16,6 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include "amiga/os3support.h"
 
 #include <exec/semaphores.h>
 #include <intuition/classes.h>

Modified: trunk/netsurf/amiga/stringview/urlhistory.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/stringview/urlhistory.c?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/stringview/urlhistory.c (original)
+++ trunk/netsurf/amiga/stringview/urlhistory.c Wed Dec 29 18:53:11 2010
@@ -22,7 +22,9 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "proto/exec.h"
+#include <proto/exec.h>
+
+#include "amiga/os3support.h"
 
 #include "urlhistory.h"
 

Modified: trunk/netsurf/amiga/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/tree.c (original)
+++ trunk/netsurf/amiga/tree.c Wed Dec 29 18:53:11 2010
@@ -15,6 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include "amiga/os3support.h"
 
 #include <proto/window.h>
 #include <proto/layout.h>
@@ -994,7 +996,7 @@
 										ASLFR_InitialFile,"tree_export.html",
 										TAG_DONE))
 									{
-										strlcpy(&fname,savereq->fr_Drawer,1024);
+										strlcpy(fname,savereq->fr_Drawer,1024);
 										AddPart(fname,savereq->fr_File,1024);
 										ami_update_pointer(twin->win,GUI_POINTER_WAIT);
 										if(twin->type == AMI_TREE_HISTORY)

Modified: trunk/netsurf/amiga/tree.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.h?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- trunk/netsurf/amiga/tree.h (original)
+++ trunk/netsurf/amiga/tree.h Wed Dec 29 18:53:11 2010
@@ -21,6 +21,7 @@
 
 #include <exec/types.h>
 #include <intuition/classusr.h>
+#include "amiga/os3support.h"
 #include "amiga/gui.h"
 #include "desktop/tree.h"
 #include "desktop/sslcert.h"




More information about the netsurf-commits mailing list