--- ./src/htmltextslave.c Sun Mar 30 18:02:58 2003
+++ ../gtkhtml-1.1.10/./src/htmltextslave.c Thu May 29 17:25:05 2003
@@ -413,7 +413,7 @@
return o->prev ? FALSE : TRUE;
}
-inline gint
+gint
html_text_slave_nb_width (HTMLTextSlave *slave, HTMLPainter *painter, gint words)
{
return get_words_width (slave->owner, painter, slave->start_word, words)
@@ -420,7 +420,7 @@
+ (slave->start_word + words == slave->owner->words ? get_next_nb_width (slave, painter) : 0);
}
-inline gchar *
+gchar *
html_text_slave_remove_leading_space (HTMLTextSlave *slave, HTMLPainter *painter, gboolean lineBegin)
{
gchar *begin;
--- ./src/test.c Tue Dec 18 18:04:28 2001
+++ ../gtkhtml-1.1.10/./src/test.c Thu May 29 17:25:25 2003
@@ -29,6 +29,9 @@
#include "gtkhtml.h"
#include "gtkhtml-stream.h"
+#include /* for HAVE_ALLOCA_H */
+#include "gtkhtml-compat.h" /* for alloca() */
+
#define BUTTON_INDEX 6
GtkWidget *html;
--- ./src/htmlclueflow.c Tue Nov 5 15:59:53 2002
+++ ../gtkhtml-1.1.10/./src/htmlclueflow.c Thu May 29 17:26:07 2003
@@ -60,7 +60,7 @@
#define HCF_CLASS(x) HTML_CLUEFLOW_CLASS (HTML_OBJECT (x)->klass)
#define HTML_IS_PLAIN_PAINTER(obj) (GTK_CHECK_TYPE ((obj), HTML_TYPE_PLAIN_PAINTER))
-inline HTMLHAlignType html_clueflow_get_halignment (HTMLClueFlow *flow);
+HTMLHAlignType html_clueflow_get_halignment (HTMLClueFlow *flow);
static gchar * get_item_number_str (HTMLClueFlow *flow);
static guint get_post_padding (HTMLClueFlow *flow,
guint pad);
@@ -2506,7 +2506,7 @@
relayout_and_draw (HTML_OBJECT (flow), engine);
}
-inline HTMLHAlignType
+HTMLHAlignType
html_clueflow_get_halignment (HTMLClueFlow *flow)
{
g_return_val_if_fail (flow != NULL, HTML_HALIGN_NONE);
--- ./src/htmlobject.c Tue Sep 24 16:56:59 2002
+++ ../gtkhtml-1.1.10/./src/htmlobject.c Thu May 29 17:26:45 2003
@@ -1440,7 +1440,7 @@
return obj;
}
-inline HTMLObject *
+HTMLObject *
html_object_next_leaf (HTMLObject *self)
{
return move_object (self, html_object_next, html_object_head);
@@ -1455,7 +1455,7 @@
return rv;
}
-inline HTMLObject *
+HTMLObject *
html_object_prev_leaf (HTMLObject *self)
{
return move_object (self, html_object_prev, html_object_tail);
@@ -1546,13 +1546,13 @@
return obj;
}
-inline HTMLObject *
+HTMLObject *
html_object_next_cursor (HTMLObject *self, gint *offset)
{
return move_object_cursor (self, offset, TRUE, html_object_next_not_slave, html_object_head);
}
-inline HTMLObject *
+HTMLObject *
html_object_prev_cursor (HTMLObject *self, gint *offset)
{
return move_object_cursor (self, offset, FALSE, html_object_prev_not_slave, html_object_tail_not_slave);
--- ./src/htmlinterval.c Mon Nov 18 14:02:05 2002
+++ ../gtkhtml-1.1.10/./src/htmlinterval.c Thu May 29 17:27:30 2003
@@ -27,7 +27,7 @@
#include "htmlobject.h"
#include "htmlselection.h"
-inline void
+void
html_point_construct (HTMLPoint *p, HTMLObject *o, guint off)
{
p->object = o;
@@ -43,7 +43,7 @@
return np;
}
-inline void
+void
html_point_destroy (HTMLPoint *p)
{
g_free (p);
@@ -55,7 +55,7 @@
return p->object == c->object && (!html_object_is_container (p->object) || p->offset == c->offset);
}
-inline void
+void
html_point_next_cursor (HTMLPoint *p)
{
p->object = html_object_next_cursor (p->object, &p->offset);
@@ -72,7 +72,7 @@
return i;
}
-inline HTMLInterval *
+HTMLInterval *
html_interval_new_from_cursor (HTMLCursor *a, HTMLCursor *b)
{
HTMLCursor *begin, *end;
@@ -88,7 +88,7 @@
return html_interval_new (begin->object, end->object, begin->offset, end->offset);
}
-inline HTMLInterval *
+HTMLInterval *
html_interval_new_from_points (HTMLPoint *from, HTMLPoint *to)
{
return html_interval_new (from->object, to->object, from->offset, to->offset);
@@ -356,7 +356,7 @@
return rv;
}
-inline HTMLPoint *
+HTMLPoint *
html_point_min (HTMLPoint *a, HTMLPoint *b)
{
return a == html_point_max (a, b) ? b : a;
--- ./src/htmlcursor.c Sun Oct 27 12:38:25 2002
+++ ../gtkhtml-1.1.10/./src/htmlcursor.c Thu May 29 17:27:38 2003
@@ -71,7 +71,7 @@
-inline void
+void
html_cursor_init (HTMLCursor *cursor, HTMLObject *o, guint offset)
{
cursor->object = o;
--- ./ltmain.sh Mon Mar 31 13:06:29 2003
+++ ../gtkhtml-1.1.10/./ltmain.sh Thu May 29 17:27:51 2003
@@ -61,7 +61,7 @@
default_mode=
help="Try \`$progname --help' for more information."
magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
mv="mv -f"
rm="rm -f"