Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/9c93ed1bca859e5b5cb3c018be327fb91213c558
...commit
http://git.netsurf-browser.org/netsurf.git/commit/9c93ed1bca859e5b5cb3c018be327fb91213c558
...tree
http://git.netsurf-browser.org/netsurf.git/tree/9c93ed1bca859e5b5cb3c018be327fb91213c558
The branch, master has been updated
via 9c93ed1bca859e5b5cb3c018be327fb91213c558 (commit)
via a1dc9ab55f155467dbf6b48e305658661fa09c98 (commit)
via 0ad2f2de6f6a696a70b2c61b4cd9820514ef53da (commit)
via 50cbb9894111528de5225c5023b71aa9be678b1d (commit)
from f89f7192efc43daa64c1fb591d0cfcc098b82c82 (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=9c93ed1bca859e5b5cb3c018be327fb91213c558
commit 9c93ed1bca859e5b5cb3c018be327fb91213c558
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Hopefully quash INFO confusion on Atari MINT platform
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index 6576eac..42f7400 100644
--- a/frontends/atari/rootwin.c
+++ b/frontends/atari/rootwin.c
@@ -244,7 +244,7 @@ int window_create(struct gui_window * gw,
flags |= ( SIZER );
}
if( inflags & WIDGET_STATUSBAR ) {
- flags |= ( INFO );
+ flags |= ( /* INFO */ 0x0010 );
}
gw->root = malloc(sizeof(struct s_gui_win_root));
diff --git a/utils/log.h b/utils/log.h
index 1f15e13..7b5bcc3 100644
--- a/utils/log.h
+++ b/utils/log.h
@@ -25,6 +25,10 @@
#include "utils/errors.h"
+#if defined(__MINT__)
+#undef INFO
+#endif
+
extern bool verbose_log;
/**
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=a1dc9ab55f155467dbf6b48e305658661fa09c98
commit a1dc9ab55f155467dbf6b48e305658661fa09c98
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Hopefully quash LOG compile errors in Windows
diff --git a/frontends/windows/plot.c b/frontends/windows/plot.c
index 376d372..3668e4b 100644
--- a/frontends/windows/plot.c
+++ b/frontends/windows/plot.c
@@ -580,7 +580,8 @@ line(const struct redraw_context *ctx,
const plot_style_t *style,
const struct rect *line)
{
- NSLOG(plot, DEEPDEBUG, "from %d,%d to %d,%d", x0, y0, x1, y1);
+ NSLOG(plot, DEEPDEBUG, "from %d,%d to %d,%d",
+ line->x0, line->y0, line->x1, line->y1);
/* ensure the plot HDC is set */
if (plot_hdc == NULL) {
diff --git a/frontends/windows/window.c b/frontends/windows/window.c
index 5c5dc67..9c050a4 100644
--- a/frontends/windows/window.c
+++ b/frontends/windows/window.c
@@ -1883,7 +1883,7 @@ nserror win32_window_set_scroll(struct gui_window *gw,
const struct rect *rect)
NSLOG(netsurf, DEEPDEBUG,
"requestscroll x,y:%d,%d",
- w->requestscrollx, w->requestscrolly);
+ gw->requestscrollx, gw->requestscrolly);
/* set the vertical scroll offset */
si.cbSize = sizeof(si);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=0ad2f2de6f6a696a70b2c61b4cd9820514ef53da
commit 0ad2f2de6f6a696a70b2c61b4cd9820514ef53da
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Hopefully quash LOG compile errors in BeOS
diff --git a/frontends/beos/schedule.cpp b/frontends/beos/schedule.cpp
index c2caea9..7877a83 100644
--- a/frontends/beos/schedule.cpp
+++ b/frontends/beos/schedule.cpp
@@ -70,8 +70,7 @@ schedule_remove(void (*callback)(void *p), void *p)
{
NSLOG(schedule, DEBUG,
"schedule_remove() for %p(%p)",
- cb->callback,
- cb->context);
+ callback, p);
if (callbacks == NULL)
return;
_nsbeos_callback_t cb_match;
@@ -83,7 +82,7 @@ schedule_remove(void (*callback)(void *p), void *p)
nserror beos_schedule(int t, void (*callback)(void *p), void *p)
{
- NSLOG(schedule, DEBUG, "t:%d cb:%p p:%p", t, cb->callback, cb->context);
+ NSLOG(schedule, DEBUG, "t:%d cb:%p p:%p", t, callback, p);
if (callbacks == NULL) {
callbacks = new BList;
@@ -124,7 +123,7 @@ schedule_run(void)
NSLOG(schedule, DEBUG,
"Checking %ld callbacks to for deadline.",
- this_run->CountItems());
+ callbacks->CountItems());
/* Run all the callbacks which made it this far. */
for (i = 0; i < callbacks->CountItems(); ) {
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=50cbb9894111528de5225c5023b71aa9be678b1d
commit 50cbb9894111528de5225c5023b71aa9be678b1d
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Hopefully quash warning about time_t formatting on openbsd
diff --git a/content/llcache.c b/content/llcache.c
index 50e6188..fd2a528 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -3296,7 +3296,7 @@ void llcache_clean(bool purge)
NSLOG(llcache, DEBUG,
"discarding backed object len:%zd age:%ld (%p) %s",
object->source_len,
- time(NULL) - object->last_used,
+ (long)(time(NULL) - object->last_used),
object,
nsurl_access(object->url));
-----------------------------------------------------------------------
Summary of changes:
content/llcache.c | 2 +-
frontends/atari/rootwin.c | 2 +-
frontends/beos/schedule.cpp | 7 +++----
frontends/windows/plot.c | 3 ++-
frontends/windows/window.c | 2 +-
utils/log.h | 4 ++++
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/content/llcache.c b/content/llcache.c
index 50e6188..fd2a528 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -3296,7 +3296,7 @@ void llcache_clean(bool purge)
NSLOG(llcache, DEBUG,
"discarding backed object len:%zd age:%ld (%p) %s",
object->source_len,
- time(NULL) - object->last_used,
+ (long)(time(NULL) - object->last_used),
object,
nsurl_access(object->url));
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index 6576eac..42f7400 100644
--- a/frontends/atari/rootwin.c
+++ b/frontends/atari/rootwin.c
@@ -244,7 +244,7 @@ int window_create(struct gui_window * gw,
flags |= ( SIZER );
}
if( inflags & WIDGET_STATUSBAR ) {
- flags |= ( INFO );
+ flags |= ( /* INFO */ 0x0010 );
}
gw->root = malloc(sizeof(struct s_gui_win_root));
diff --git a/frontends/beos/schedule.cpp b/frontends/beos/schedule.cpp
index c2caea9..7877a83 100644
--- a/frontends/beos/schedule.cpp
+++ b/frontends/beos/schedule.cpp
@@ -70,8 +70,7 @@ schedule_remove(void (*callback)(void *p), void *p)
{
NSLOG(schedule, DEBUG,
"schedule_remove() for %p(%p)",
- cb->callback,
- cb->context);
+ callback, p);
if (callbacks == NULL)
return;
_nsbeos_callback_t cb_match;
@@ -83,7 +82,7 @@ schedule_remove(void (*callback)(void *p), void *p)
nserror beos_schedule(int t, void (*callback)(void *p), void *p)
{
- NSLOG(schedule, DEBUG, "t:%d cb:%p p:%p", t, cb->callback, cb->context);
+ NSLOG(schedule, DEBUG, "t:%d cb:%p p:%p", t, callback, p);
if (callbacks == NULL) {
callbacks = new BList;
@@ -124,7 +123,7 @@ schedule_run(void)
NSLOG(schedule, DEBUG,
"Checking %ld callbacks to for deadline.",
- this_run->CountItems());
+ callbacks->CountItems());
/* Run all the callbacks which made it this far. */
for (i = 0; i < callbacks->CountItems(); ) {
diff --git a/frontends/windows/plot.c b/frontends/windows/plot.c
index 376d372..3668e4b 100644
--- a/frontends/windows/plot.c
+++ b/frontends/windows/plot.c
@@ -580,7 +580,8 @@ line(const struct redraw_context *ctx,
const plot_style_t *style,
const struct rect *line)
{
- NSLOG(plot, DEEPDEBUG, "from %d,%d to %d,%d", x0, y0, x1, y1);
+ NSLOG(plot, DEEPDEBUG, "from %d,%d to %d,%d",
+ line->x0, line->y0, line->x1, line->y1);
/* ensure the plot HDC is set */
if (plot_hdc == NULL) {
diff --git a/frontends/windows/window.c b/frontends/windows/window.c
index 5c5dc67..9c050a4 100644
--- a/frontends/windows/window.c
+++ b/frontends/windows/window.c
@@ -1883,7 +1883,7 @@ nserror win32_window_set_scroll(struct gui_window *gw,
const struct rect *rect)
NSLOG(netsurf, DEEPDEBUG,
"requestscroll x,y:%d,%d",
- w->requestscrollx, w->requestscrolly);
+ gw->requestscrollx, gw->requestscrolly);
/* set the vertical scroll offset */
si.cbSize = sizeof(si);
diff --git a/utils/log.h b/utils/log.h
index 1f15e13..7b5bcc3 100644
--- a/utils/log.h
+++ b/utils/log.h
@@ -25,6 +25,10 @@
#include "utils/errors.h"
+#if defined(__MINT__)
+#undef INFO
+#endif
+
extern bool verbose_log;
/**
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
