diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog
index e7ed3380f..5decdb219 100644
--- a/include/coff/ChangeLog
+++ b/include/coff/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-13  Alan Modra  <alan@linuxcare.com.au>
+
+	* ti.h (ADDR_MASK): Don't use ul suffix on constants.
+	(PG_MASK): Ditto.
+
 2000-04-11  Timothy Wall  <twall@cygnus.com>
 
 	* ti.h: Remove load page references until load pages are
diff --git a/include/coff/ti.h b/include/coff/ti.h
index 40f2d1c4c..306ad7b2c 100644
--- a/include/coff/ti.h
+++ b/include/coff/ti.h
@@ -252,10 +252,10 @@ PUT_SCNHDR_FLAGS(ABFD,((struct internal_scnhdr *)(INT))->s_flags, \
 
 #define LONG_ADDRESSES  1
 #define PG_SHIFT        (LONG_ADDRESSES ? 30 : 16)
-#define ADDR_MASK       ((1ul<<PG_SHIFT)-1)/* 16 or 24-bit addresses */
-#define PG_MASK         (3ul<<PG_SHIFT)
-#define PG_TO_FLAG(p)   ((p)<<PG_SHIFT)
-#define FLAG_TO_PG(f)   (((f)&PG_MASK)>>PG_SHIFT)
+#define ADDR_MASK       (((unsigned long) 1 << PG_SHIFT) - 1)
+#define PG_MASK         ((unsigned long) 3 << PG_SHIFT)
+#define PG_TO_FLAG(p)   ((p) << PG_SHIFT)
+#define FLAG_TO_PG(f)   (((f) & PG_MASK) >> PG_SHIFT)
 
 /*
  * names of "special" sections