summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2004-06-12 08:06:02 +0000
committerMark McLoughlin <markmc@src.gnome.org>2004-06-12 08:06:02 +0000
commit918d42c346d9dfcbef99a3f2123771f01d074124 (patch)
tree4c121f346352c72fee0f8c50ce35969c978932ce
parent4a90e0c25b593f9275a29e68caf14f28468c163d (diff)
downloadgconf-918d42c346d9dfcbef99a3f2123771f01d074124.tar.gz
64-bit fix from Joe Marcus Clarke <marcus@freebsd.org>
2004-06-12 Mark McLoughlin <mark@skynet.ie> 64-bit fix from Joe Marcus Clarke <marcus@freebsd.org> * backends/markup-tree.c: (parse_tree): the length returned from g_file_get_contents() is a gsize not an int.
-rw-r--r--ChangeLog8
-rw-r--r--backends/markup-tree.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ab461aba..caac244d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-12 Mark McLoughlin <mark@skynet.ie>
+
+ 64-bit fix from Joe Marcus Clarke <marcus@freebsd.org>
+
+ * backends/markup-tree.c: (parse_tree): the length
+ returned from g_file_get_contents() is a gsize
+ not an int.
+
2004-06-09 Kjartan Maraas <kmaraas@gnome.org>
* gconf/gconf-internals.c: (gconf_activate_server):
diff --git a/backends/markup-tree.c b/backends/markup-tree.c
index 93ebf142..7527f00c 100644
--- a/backends/markup-tree.c
+++ b/backends/markup-tree.c
@@ -3070,7 +3070,7 @@ parse_tree (MarkupDir *root,
ParseInfo info;
char *filename;
char *text;
- int length;
+ gsize length;
filename = markup_dir_build_path (root, TRUE, parse_subtree);