Index: tests/.expect/functions.x86.txt
===================================================================
--- tests/.expect/functions.x86.txt	(revision 2e63915aca103be4ab005d1841d0e8c784dfc75b)
+++ tests/.expect/functions.x86.txt	(revision 1f6623cc5ccfb6fc3081e1e36443d8845caab60a)
@@ -123,5 +123,5 @@
 struct _tuple2_ {
 };
-static inline void _layoutof__tuple2_(unsigned long int *_sizeof__tuple2_, unsigned long int *_alignof__tuple2_, unsigned long int *_offsetof__tuple2_, const unsigned long int _sizeof_Y15tuple_param_2_0, __attribute__ ((unused)) const unsigned long int _alignof_Y15tuple_param_2_0, const unsigned long int _sizeof_Y15tuple_param_2_1, __attribute__ ((unused)) const unsigned long int _alignof_Y15tuple_param_2_1){
+static inline void _layoutof__tuple2_(unsigned int *_sizeof__tuple2_, unsigned int *_alignof__tuple2_, unsigned int *_offsetof__tuple2_, const unsigned int _sizeof_Y15tuple_param_2_0, __attribute__ ((unused)) const unsigned int _alignof_Y15tuple_param_2_0, const unsigned int _sizeof_Y15tuple_param_2_1, __attribute__ ((unused)) const unsigned int _alignof_Y15tuple_param_2_1){
     ((void)((*_sizeof__tuple2_)=0));
     ((void)((*_alignof__tuple2_)=1));
@@ -160,5 +160,5 @@
 struct _tuple3_ {
 };
-static inline void _layoutof__tuple3_(unsigned long int *_sizeof__tuple3_, unsigned long int *_alignof__tuple3_, unsigned long int *_offsetof__tuple3_, const unsigned long int _sizeof_Y15tuple_param_3_0, __attribute__ ((unused)) const unsigned long int _alignof_Y15tuple_param_3_0, const unsigned long int _sizeof_Y15tuple_param_3_1, __attribute__ ((unused)) const unsigned long int _alignof_Y15tuple_param_3_1, const unsigned long int _sizeof_Y15tuple_param_3_2, __attribute__ ((unused)) const unsigned long int _alignof_Y15tuple_param_3_2){
+static inline void _layoutof__tuple3_(unsigned int *_sizeof__tuple3_, unsigned int *_alignof__tuple3_, unsigned int *_offsetof__tuple3_, const unsigned int _sizeof_Y15tuple_param_3_0, __attribute__ ((unused)) const unsigned int _alignof_Y15tuple_param_3_0, const unsigned int _sizeof_Y15tuple_param_3_1, __attribute__ ((unused)) const unsigned int _alignof_Y15tuple_param_3_1, const unsigned int _sizeof_Y15tuple_param_3_2, __attribute__ ((unused)) const unsigned int _alignof_Y15tuple_param_3_2){
     ((void)((*_sizeof__tuple3_)=0));
     ((void)((*_alignof__tuple3_)=1));
Index: tests/nowarn/.expect/printf-sizeof.txt
===================================================================
--- tests/nowarn/.expect/printf-sizeof.txt	(revision 1f6623cc5ccfb6fc3081e1e36443d8845caab60a)
+++ tests/nowarn/.expect/printf-sizeof.txt	(revision 1f6623cc5ccfb6fc3081e1e36443d8845caab60a)
@@ -0,0 +1,3 @@
+1
+1
+10
Index: tests/nowarn/printf-sizeof.cfa
===================================================================
--- tests/nowarn/printf-sizeof.cfa	(revision 1f6623cc5ccfb6fc3081e1e36443d8845caab60a)
+++ tests/nowarn/printf-sizeof.cfa	(revision 1f6623cc5ccfb6fc3081e1e36443d8845caab60a)
@@ -0,0 +1,31 @@
+// From fixed Trac #269
+
+forall( T )
+void fred( T x ) {
+    printf( "%zu\n", sizeof(T) );
+    printf( "%zu\n", sizeof(x) );
+    (void) x;  // FIX ME: work around Trac #300
+}
+
+#include <array.hfa>
+forall( [N] )
+void mary( array(char, N) & ) {
+    printf( "%zu\n", N );    
+  #if defined TRY_TRAC_269_REMAINDER
+	for ( i; N ) {
+        if (i > 0) printf(" ");
+        printf( "%zu", i); // FIX ME: i still getting type long unsigned int on -m32
+	}
+    printf("\n");
+  #endif
+}
+
+int main() {
+    char c = 'x';
+    fred(c);
+
+    array( char, 10 ) a;
+    mary(a);
+
+    return 0;
+}
Index: tests/nowarn/zero-thunk.cfa
===================================================================
--- tests/nowarn/zero-thunk.cfa	(revision 2e63915aca103be4ab005d1841d0e8c784dfc75b)
+++ tests/nowarn/zero-thunk.cfa	(revision 1f6623cc5ccfb6fc3081e1e36443d8845caab60a)
@@ -6,5 +6,5 @@
 forall( T )
 T g( zero_t ) {
-    printf( "%ld\n", sizeof(T) );
+    printf( "%zd\n", sizeof(T) );
     return (T){};
 }
