Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/053fd7b5830b4adfe9703be281f6ecfa68e0410b
...commit
http://git.netsurf-browser.org/netsurf.git/commit/053fd7b5830b4adfe9703be281f6ecfa68e0410b
...tree
http://git.netsurf-browser.org/netsurf.git/tree/053fd7b5830b4adfe9703be281f6ecfa68e0410b
The branch, master has been updated
via 053fd7b5830b4adfe9703be281f6ecfa68e0410b (commit)
via c1c8ed794de6c0f2a4da18ceb6a62c9f8841aeac (commit)
from bb056e55b1374a72ed7784a461d027fbd6360b40 (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=053fd7b5830b4adfe9703be281f6ecfa68e0410b
commit 053fd7b5830b4adfe9703be281f6ecfa68e0410b
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Fix atari INFO macro name collision
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index b4fb16e..a2f27e2 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -47,6 +47,7 @@ CFLAGS += -U__STRICT_ANSI__ -std=c99 -Dsmall -Dnsatari \
-D_BSD_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
+ -DNSLOG_LEVEL_0x0010=NSLOG_LEVEL_INFO \
$(shell $(PKG_CONFIG) --cflags openssl ) \
$(shell $(PKG_CONFIG) --cflags libcurl )
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=c1c8ed794de6c0f2a4da18ceb6a62c9f8841aeac
commit c1c8ed794de6c0f2a4da18ceb6a62c9f8841aeac
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Revert "Hopefully quash INFO confusion on Atari MINT platform"
This reverts commit 9c93ed1bca859e5b5cb3c018be327fb91213c558.
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index 42f7400..6576eac 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 */ 0x0010 );
+ flags |= ( INFO );
}
gw->root = malloc(sizeof(struct s_gui_win_root));
diff --git a/utils/log.h b/utils/log.h
index e73c8c3..a94afc1 100644
--- a/utils/log.h
+++ b/utils/log.h
@@ -25,10 +25,6 @@
#include "utils/errors.h"
-#if defined(__MINT__)
-#undef INFO
-#endif
-
extern bool verbose_log;
/**
-----------------------------------------------------------------------
Summary of changes:
frontends/atari/Makefile | 1 +
frontends/atari/rootwin.c | 2 +-
utils/log.h | 4 ----
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index b4fb16e..a2f27e2 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -47,6 +47,7 @@ CFLAGS += -U__STRICT_ANSI__ -std=c99 -Dsmall -Dnsatari \
-D_BSD_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
+ -DNSLOG_LEVEL_0x0010=NSLOG_LEVEL_INFO \
$(shell $(PKG_CONFIG) --cflags openssl ) \
$(shell $(PKG_CONFIG) --cflags libcurl )
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index 42f7400..6576eac 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 */ 0x0010 );
+ flags |= ( INFO );
}
gw->root = malloc(sizeof(struct s_gui_win_root));
diff --git a/utils/log.h b/utils/log.h
index e73c8c3..a94afc1 100644
--- a/utils/log.h
+++ b/utils/log.h
@@ -25,10 +25,6 @@
#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
