--- include/mapnik/color.hpp.orig	2008-03-24 12:08:59.000000000 +0000
+++ include/mapnik/color.hpp	2008-03-24 13:24:39.000000000 +0000
@@ -40,10 +40,10 @@
             :abgr_(0xffffffff) {}
 
         Color(int red,int green,int blue,int alpha=0xff)
-            : abgr_((alpha&0xff) << 24 | 
-                    (blue&0xff) << 16  | 
-                    (green&0xff) << 8  | 
-                    red&0xff) {}
+	    : abgr_(((alpha&0xff) << 24 | 
+		     (blue&0xff)) << 16 | 
+		     ((green&0xff) << 8 | 
+		     (red&0xff))) {}
         
         explicit Color(int rgba)
             : abgr_(rgba) {}
@@ -88,7 +88,7 @@
         }
         inline void set_alpha(unsigned int a)
         {
-            abgr_ = (abgr_ & 0x00ffffff | (a&0xff) << 24);
+	    abgr_ = (abgr_ & 0x00ffffff) | ((a&0xff) << 24);
         }
 
         inline unsigned int rgba() const
--- src/wkb.cpp.orig	2008-03-24 13:49:09.000000000 +0000
+++ src/wkb.cpp	2008-03-24 13:57:41.000000000 +0000
@@ -145,7 +145,10 @@
             else 
             {
                const char* b=wkb_+pos_;
-               n = b[3]&0xff | (b[2]&0xff)<<8 | (b[1]&0xff)<<16 | (b[0]&0xff)<<24;
+               n = (((b[3]&0xff) | 
+		     (b[2]&0xff)) << 8 | 
+		    ((b[1]&0xff) << 16 | 
+		     (b[0]&0xff)) << 24);
             }
             pos_+=4;
 
@@ -166,14 +169,14 @@
                // but not in C++ yet
                // this is not quite portable
                const char* b= wkb_+pos_;
-               long long n = (long long)b[7]&0xff | 
-                  ((long long)b[6]&0xff)<<8 | 
-                  ((long long)b[5]&0xff)<<16 | 
-                  ((long long)b[4]&0xff)<<24 |
-                  ((long long)b[3]&0xff)<<32 |
-                  ((long long)b[2]&0xff)<<40 |
-                  ((long long)b[1]&0xff)<<48 |
-                  ((long long)b[0]&0xff)<<56;
+               long long n = (((long long)b[7]&0xff) | 
+			      ((long long)b[6]&0xff)<<8 | 
+			      ((long long)b[5]&0xff)<<16 | 
+			      ((long long)b[4]&0xff)<<24 |
+			      ((long long)b[3]&0xff)<<32 |
+			      ((long long)b[2]&0xff)<<40 |
+			      ((long long)b[1]&0xff)<<48 |
+			      ((long long)b[0]&0xff)<<56);
                memcpy(&d,&n,8);
             }
             pos_+=8;
--- tinyxml/tinyxmlparser.cpp.orig	2008-03-24 13:59:50.000000000 +0000
+++ tinyxml/tinyxmlparser.cpp	2008-03-24 14:07:38.000000000 +0000
@@ -354,7 +354,7 @@
 	}
 	else
 	{
-		while ( *p && IsWhiteSpace( *p ) || *p == '\n' || *p =='\r' )
+	  while ((*p && IsWhiteSpace( *p )) || *p == '\n' || *p =='\r' )
 			++p;
 	}
 
--- plugins/input/shape/shapefile.hpp.orig	2008-03-24 14:11:09.000000000 +0000
+++ plugins/input/shape/shapefile.hpp	2008-03-24 14:14:43.000000000 +0000
@@ -122,16 +122,20 @@
       {
          char b[4];
          file_.read(b, 4);
-         return b[3] & 0xffu | (b[2] & 0xffu) << 8 |
-            (b[1] & 0xffu) << 16 | (b[0] & 0xffu) << 24;
+         return (((b[3] & 0xffu) | 
+		  (b[2] & 0xffu)) << 8 |
+		 ((b[1] & 0xffu) << 16 | 
+		  (b[0] & 0xffu)) << 24);
       }
       
       inline int read_ndr_integer()
       {
          char b[4];
          file_.read(b,4);
-         return b[0]&0xffu | (b[1]&0xffu) << 8 | 
-            (b[2]&0xffu) << 16 | (b[3]&0xffu) << 24;
+         return (((b[0]&0xffu) | 
+		  (b[1]&0xffu)) << 8 | 
+		 ((b[2]&0xffu) << 16 | 
+		  (b[3]&0xffu)) << 24);
       }
       
       inline double read_double()
--- plugins/input/shape/dbffile.hpp.orig	2008-03-24 14:36:28.000000000 +0000
+++ plugins/input/shape/dbffile.hpp	2008-03-24 14:36:46.000000000 +0000
@@ -36,7 +36,6 @@
 
 using mapnik::transcoder;
 using mapnik::Feature;
-class mapnik::transcoder;
 
 struct field_descriptor
 {