Index: libqhtml/css.c
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/css.c,v
retrieving revision 1.7
diff -u -r1.7 css.c
--- libqhtml/css.c	28 Dec 2006 11:27:30 -0000	1.7
+++ libqhtml/css.c	30 Dec 2006 09:14:20 -0000
@@ -230,7 +230,7 @@
     return ch;
 }
 
-static int str_nextc(__unused__ EditBuffer *b, unsigned long *offset_ptr)
+static int str_nextc(__attribute__((unused)) EditBuffer *b, unsigned long *offset_ptr)
 {
     const unsigned char *ptr;
     int ch;
@@ -425,7 +425,7 @@
                               CSSState *state, 
                               CSSProperty *p, 
                               CSSState *state_parent,
-                              __unused__ CSSBox *box)
+                              __attribute__((unused)) CSSBox *box)
 {
     int *ptr, val;
     const CSSPropertyDef *def;
@@ -3969,7 +3969,7 @@
 }
 
 static void css_display_block(CSSContext *s, 
-                              CSSBox *box, __unused__ CSSState *props_parent,
+                              CSSBox *box, __attribute__((unused)) CSSState *props_parent,
                               CSSRect *clip_box, int dx, int dy)
 {
     CSSState *props;
Index: libqhtml/cssparse.c
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/cssparse.c,v
retrieving revision 1.7
diff -u -r1.7 cssparse.c
--- libqhtml/cssparse.c	28 Dec 2006 11:27:30 -0000	1.7
+++ libqhtml/cssparse.c	30 Dec 2006 09:14:20 -0000
@@ -33,7 +33,7 @@
 #include <assert.h>
 
 static void css_error1(CSSParseState *b, const char *fmt, ...)
-         __attr_printf(2,3);
+         __attribute__((format (printf, 2, 3)));
 
 static void css_error1(CSSParseState *b, const char *fmt, ...)
 {
Index: libqhtml/xmlparse.c
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/xmlparse.c,v
retrieving revision 1.7
diff -u -r1.7 xmlparse.c
--- libqhtml/xmlparse.c	28 Dec 2006 11:27:30 -0000	1.7
+++ libqhtml/xmlparse.c	30 Dec 2006 09:14:20 -0000
@@ -173,7 +173,7 @@
         b->buf = ptr;
         b->allocated_size = size1;
 
-        b->size += utf8_encode((char*)b->buf + b->size, ch);
+        b->size = (unsigned char *)utf8_encode((char*)b->buf + b->size, ch) - b->buf;
     }
 }
 
@@ -181,7 +181,7 @@
 {
     if (b->size < b->allocated_size) {
         /* fast case */
-        b->size += utf8_encode((char*)b->buf + b->size, ch);
+        b->size = (unsigned char *)utf8_encode((char*)b->buf + b->size, ch) - b->buf;
     } else {
         strbuf_addch1(b, ch);
     }
@@ -770,7 +770,7 @@
 }
 
 static void xml_error(XMLState *s, const char *fmt, ...)
-        __attr_printf(2,3);
+        __attribute__((format (printf, 2, 3)));
 
 static void xml_error(XMLState *s, const char *fmt, ...)
 {