@@ -0,0 +1,30 @@
+--- include/parsedump.h
++++ include/parsedump.h
+@@ -30,7 +30,6 @@
+ const char *canon;
+ };
+
+-extern const struct fieldinfo fieldinfos[];
+ extern const struct nickname nicknames[];
+ extern const int nfields; /* = elements in fieldinfos, including the sentinels */
+
+@@ -68,6 +67,8 @@
+ unsigned int integer;
+ };
+
++extern const struct fieldinfo fieldinfos[];
++
+ void parseerr(FILE *file, const char *filename, int lno, FILE *warnto, int *warncount,
+ const struct pkginfo *pigp, int warnonly,
+ const char *fmt, ...) PRINTFFORMAT(8,9);
+--- lib/mlib.c
++++ lib/mlib.c
+@@ -189,7 +189,7 @@
+ switch(data->type) {
+ case BUFFER_WRITE_BUF:
+ memcpy(data->data.ptr, buf, length);
+- (char*)data->data.ptr += length;
++ data->data.ptr = ((char*)data->data.ptr) + length;
+ break;
+ case BUFFER_WRITE_VBUF:
+ varbufaddbuf((struct varbuf *)data->data.ptr, buf, length);
|