summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2005-01-13 20:29:24 +0000
committerJames Bursa <james@netsurf-browser.org>2005-01-13 20:29:24 +0000
commita76404dfd076925eebeb8166f588e0d5e7a9fdd3 (patch)
treedef5a2c0dfcfc059c4b13ee8ebe30fc2507fa5d9
parent2f19e15e33b57342ba98d81711650387e461b41b (diff)
downloadnetsurf-a76404dfd076925eebeb8166f588e0d5e7a9fdd3.tar.gz
netsurf-a76404dfd076925eebeb8166f588e0d5e7a9fdd3.tar.bz2
[project @ 2005-01-13 20:28:50 by bursa]
Fix some compilation warnings in the debug build. Update nsgtk_plot_rectangle() with the new parameters. svn path=/import/netsurf/; revision=1447
-rw-r--r--content/fetchcache.c3
-rw-r--r--debug/filetyped.c1
-rw-r--r--gtk/gtk_plotters.c4
-rw-r--r--render/box.c1
-rw-r--r--render/layout.c4
5 files changed, 9 insertions, 4 deletions
diff --git a/content/fetchcache.c b/content/fetchcache.c
index c93b6fe73..bd20d12a3 100644
--- a/content/fetchcache.c
+++ b/content/fetchcache.c
@@ -13,6 +13,7 @@
* fetch changes and data is received, the content is updated appropriately.
*/
+#define _GNU_SOURCE /* for strndup */
#include <assert.h>
#include <string.h>
#include <sys/types.h>
@@ -79,7 +80,7 @@ struct content * fetchcache(const char *url,
/* strip fragment identifier */
if ((hash = strchr(url1, '#')) != NULL)
- *hash = NULL;
+ *hash = 0;
LOG(("url %s", url1));
diff --git a/debug/filetyped.c b/debug/filetyped.c
index a1c3876a9..3bf10ece5 100644
--- a/debug/filetyped.c
+++ b/debug/filetyped.c
@@ -6,6 +6,7 @@
*/
#include <stdlib.h>
+#include <string.h>
#include "netsurf/content/fetch.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/utils.h"
diff --git a/gtk/gtk_plotters.c b/gtk/gtk_plotters.c
index 94d39fdd4..9054573e2 100644
--- a/gtk/gtk_plotters.c
+++ b/gtk/gtk_plotters.c
@@ -23,7 +23,7 @@ extern GdkGC *current_gc;
static bool nsgtk_plot_clg(colour c);
static bool nsgtk_plot_rectangle(int x0, int y0, int width, int height,
- colour c, bool dotted);
+ int line_width, colour c, bool dotted, bool dashed);
static bool nsgtk_plot_line(int x0, int y0, int x1, int y1, int width,
colour c, bool dotted, bool dashed);
static bool nsgtk_plot_polygon(int *p, unsigned int n, colour fill);
@@ -69,7 +69,7 @@ bool nsgtk_plot_clg(colour c)
bool nsgtk_plot_rectangle(int x0, int y0, int width, int height,
- colour c, bool dotted)
+ int line_width, colour c, bool dotted, bool dashed)
{
nsgtk_set_colour(c);
gdk_draw_rectangle(current_drawable, current_gc,
diff --git a/render/box.c b/render/box.c
index bf055eac4..4d57c9f8c 100644
--- a/render/box.c
+++ b/render/box.c
@@ -11,6 +11,7 @@
* Conversion of XML tree to box tree (implementation).
*/
+#define _GNU_SOURCE /* for strndup */
#include <assert.h>
#include <ctype.h>
#include <stdio.h>
diff --git a/render/layout.c b/render/layout.c
index c1d36e1ab..5b5a1453c 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -14,6 +14,7 @@
* precalculation of minimum / maximum box widths.
*/
+#define _GNU_SOURCE /* for strndup */
#include <alloca.h>
#include <assert.h>
#include <ctype.h>
@@ -1508,7 +1509,8 @@ bool layout_table(struct box *table, int available_width,
else
excess_y[i] = 0;
if (row_span_cell[i] != 0)
- row_span_cell[i]->padding[BOTTOM] += row_height +
+ row_span_cell[i]->padding[BOTTOM] +=
+ row_height +
border_spacing_v;
}