Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/b0a9388db8c81a28c449d5cc84e4d1a4930c7222
...commit
http://git.netsurf-browser.org/netsurf.git/commit/b0a9388db8c81a28c449d5cc84e4d1a4930c7222
...tree
http://git.netsurf-browser.org/netsurf.git/tree/b0a9388db8c81a28c449d5cc84e4d1a4930c7222
The branch, chris/ndk32 has been updated
via b0a9388db8c81a28c449d5cc84e4d1a4930c7222 (commit)
via 6431c62472f27e99a8ff5ed34d6e598c76e60c30 (commit)
from 2535d48321b3a40131c5246b3c560bbf95f4bd35 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=b0a9388db8c81a28c449d5cc84e4d1a4930c7222
commit b0a9388db8c81a28c449d5cc84e4d1a4930c7222
Author: Chris Young <ch...@unsatisfactorysoftware.co.uk>
Commit: Chris Young <ch...@unsatisfactorysoftware.co.uk>
Amiga: Manually define mc68000 required for NDK3.2 inlines
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 99745c9..80b6f83 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -7,7 +7,7 @@ CFLAGS += -std=c99 -Dnsamiga
ifneq ($(SUBTARGET),os3)
CFLAGS += -O2 -mstrict-align -finline-functions -U__STRICT_ANSI__
-D__USE_INLINE__ -D__USE_BASETYPE__
else
- CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020
+ CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020 -Dmc68000
endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6431c62472f27e99a8ff5ed34d6e598c76e60c30
commit 6431c62472f27e99a8ff5ed34d6e598c76e60c30
Author: Chris Young <ch...@unsatisfactorysoftware.co.uk>
Commit: Chris Young <ch...@unsatisfactorysoftware.co.uk>
Revert "Amiga: Fix some undefined references"
This reverts commit 2535d48321b3a40131c5246b3c560bbf95f4bd35.
diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index aae3f30..fe94eb2 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -185,9 +185,6 @@ AMINS_LIB_STRUCT(Keymap);
AMINS_LIB_STRUCT(Layers);
AMINS_LIB_STRUCT(Locale);
AMINS_LIB_STRUCT(P96);
-#ifndef __amigaos4__
-AMINS_LIB_STRUCT(Utility);
-#endif
AMINS_LIB_STRUCT(Workbench);
AMINS_LIB_STRUCT(Codesets);
diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c
index 533e7f6..18eb1af 100644
--- a/frontends/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
@@ -42,11 +42,10 @@ struct nscallback
};
static struct nscallback *tioreq;
-#ifdef __amigaos4__
struct Device *TimerBase;
+#ifdef __amigaos4__
struct TimerIFace *ITimer;
#else
-struct Library *TimerBase;
static struct MsgPort *schedule_msgport = NULL;
#endif
@@ -82,7 +81,7 @@ static void ami_schedule_remove_timer_event(struct nscallback
*nscb)
static nserror ami_schedule_add_timer_event(struct nscallback *nscb, int t)
{
struct TimeVal tv;
- ULONG time_us = t * 1000; /* t converted to microseconds */
+ ULONG time_us = t * 1000; /* t converted to ?s */
tv.tv_secs = time_us / 1000000;
tv.tv_micro = time_us % 1000000;
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/Makefile | 2 +-
frontends/amiga/libs.c | 3 ---
frontends/amiga/schedule.c | 5 ++---
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 99745c9..80b6f83 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -7,7 +7,7 @@ CFLAGS += -std=c99 -Dnsamiga
ifneq ($(SUBTARGET),os3)
CFLAGS += -O2 -mstrict-align -finline-functions -U__STRICT_ANSI__
-D__USE_INLINE__ -D__USE_BASETYPE__
else
- CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020
+ CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020 -Dmc68000
endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index aae3f30..fe94eb2 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -185,9 +185,6 @@ AMINS_LIB_STRUCT(Keymap);
AMINS_LIB_STRUCT(Layers);
AMINS_LIB_STRUCT(Locale);
AMINS_LIB_STRUCT(P96);
-#ifndef __amigaos4__
-AMINS_LIB_STRUCT(Utility);
-#endif
AMINS_LIB_STRUCT(Workbench);
AMINS_LIB_STRUCT(Codesets);
diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c
index 533e7f6..18eb1af 100644
--- a/frontends/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
@@ -42,11 +42,10 @@ struct nscallback
};
static struct nscallback *tioreq;
-#ifdef __amigaos4__
struct Device *TimerBase;
+#ifdef __amigaos4__
struct TimerIFace *ITimer;
#else
-struct Library *TimerBase;
static struct MsgPort *schedule_msgport = NULL;
#endif
@@ -82,7 +81,7 @@ static void ami_schedule_remove_timer_event(struct nscallback
*nscb)
static nserror ami_schedule_add_timer_event(struct nscallback *nscb, int t)
{
struct TimeVal tv;
- ULONG time_us = t * 1000; /* t converted to microseconds */
+ ULONG time_us = t * 1000; /* t converted to ?s */
tv.tv_secs = time_us / 1000000;
tv.tv_micro = time_us % 1000000;
--
NetSurf Browser_______________________________________________
netsurf-commits mailing list -- netsurf-commits@netsurf-browser.org
To unsubscribe send an email to netsurf-commits-le...@netsurf-browser.org
