--- ./libmng_object_prc.c	Sat Mar  1 11:08:40 2003
+++ ../libmng-1.0.5/./libmng_object_prc.c	Mon Mar 24 13:21:55 2003
@@ -922,12 +922,18 @@
         *((mng_uint32p)pTemp) = 0x00000000l;
         pTemp += 4;
       } */
-      for (iX = 0; iX < (iImgdatasize & (mng_uint32)(~3L)); iX += 4)
-        *((mng_uint32p)pTemp)++ = 0x00000000l;
-      if (iImgdatasize & 2)
-        *((mng_uint16p)pTemp)++ = 0;
-      if (iImgdatasize & 1)
-        *((mng_uint8p)pTemp)++  = 0;
+      for (iX = 0; iX < (iImgdatasize & (mng_uint32)(~3L)); iX += 4) {
+	mng_uint32p pTemp32 = pTemp;
+        *pTemp32++ = 0x00000000l;
+	pTemp = (mng_uint8p)pTemp32;
+      }
+      if (iImgdatasize & 2) {
+	mng_uint16p pTemp16 = pTemp;
+        *pTemp16++ = 0;
+	pTemp = (mng_uint8p)pTemp16;
+      }
+      if (iImgdatasize & 1) 
+        *pTemp++  = 0;
 /* SF-bug #664911 end */
 
       while (pTemp < (pBuf->pImgdata + iImgdatasize))
--- ./contrib/gcc/gtk-mng-view/gtk-mng-view.c	Sat Mar  1 11:11:12 2003
+++ ../libmng-1.0.5/./contrib/gcc/gtk-mng-view/gtk-mng-view.c	Mon Mar 24 13:13:06 2003
@@ -22,7 +22,7 @@
 
 #include <gtk/gtkmain.h>
 #include "gtk-mng-view.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
+/* #include <gdk-pixbuf/gdk-pixbuf.h> */
 
 /* MNG callbacks */
 
--- ./configure	Sat Mar  1 11:13:27 2003
+++ ../libmng-1.0.5/./configure	Mon Mar 24 13:33:30 2003
@@ -6551,7 +6551,7 @@
   cat > conftest.$ac_ext <<EOF
 #line 6553 "configure"
 #include "confdefs.h"
-#include <lcms.h>
+#include <lcms/lcms.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:6558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }