Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/06c85e1df894a99b77a9539decdaf8ba862c7883
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/06c85e1df894a99b77a9539decdaf8ba862c7883
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/06c85e1df894a99b77a9539decdaf8ba862c7883

The branch, chris/debug has been created
        at  06c85e1df894a99b77a9539decdaf8ba862c7883 (commit)

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=06c85e1df894a99b77a9539decdaf8ba862c7883
commit 06c85e1df894a99b77a9539decdaf8ba862c7883
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>

    Updates to allow clib2 memory debug mode to work

diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index b539735..67e3be0 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -7,7 +7,7 @@ CFLAGS += -std=c99 -Dnsamiga
 ifneq ($(SUBTARGET),os3)
   CFLAGS += -O2 -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 -D__MEM_DEBUG
 endif
 
 $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
@@ -20,10 +20,10 @@ LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl 
openssl)
 LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
 LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
 
-LDFLAGS += -lpbl -liconv -ldebug
+LDFLAGS += -lpbl -liconv
 
 ifeq ($(SUBTARGET),os3)
-  LDFLAGS += -lamiga -lm
+  LDFLAGS += -lamiga -lm -ldebug
 endif
 
 EXETARGET := NetSurf
diff --git a/frontends/amiga/memory.c b/frontends/amiga/memory.c
index b52997f..b2a20be 100755
--- a/frontends/amiga/memory.c
+++ b/frontends/amiga/memory.c
@@ -148,7 +148,7 @@ struct Interrupt *ami_memory_init(void)
        struct Interrupt *memhandler = malloc(sizeof(struct Interrupt));
        if(memhandler == NULL) return NULL; // we're screwed
 
-       kprintf("init");
+       kprintf("netsurf init");
 
        memhandler->is_Node.ln_Pri = -127; // low down as will be slow
        memhandler->is_Node.ln_Name = "NetSurf low memory handler";


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=840669851fb94e0c9ff60af00277f0d660f7e0c0
commit 840669851fb94e0c9ff60af00277f0d660f7e0c0
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>

    Enable clib2 debug to work

diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index ea6e8fe..b539735 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -20,7 +20,7 @@ LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl 
openssl)
 LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
 LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
 
-LDFLAGS += -lpbl -liconv
+LDFLAGS += -lpbl -liconv -ldebug
 
 ifeq ($(SUBTARGET),os3)
   LDFLAGS += -lamiga -lm
diff --git a/frontends/amiga/memory.c b/frontends/amiga/memory.c
index d371d25..b52997f 100755
--- a/frontends/amiga/memory.c
+++ b/frontends/amiga/memory.c
@@ -148,6 +148,8 @@ struct Interrupt *ami_memory_init(void)
        struct Interrupt *memhandler = malloc(sizeof(struct Interrupt));
        if(memhandler == NULL) return NULL; // we're screwed
 
+       kprintf("init");
+
        memhandler->is_Node.ln_Pri = -127; // low down as will be slow
        memhandler->is_Node.ln_Name = "NetSurf low memory handler";
        memhandler->is_Data = NULL;


-----------------------------------------------------------------------


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to