Index: libcfa/prelude/builtins.c
===================================================================
--- libcfa/prelude/builtins.c	(revision 8a972486173f920eea1f1868fff138e1568a8a59)
+++ libcfa/prelude/builtins.c	(revision 4c0acb0b6af122e6341b3f48d576cce95e22fdd2)
@@ -149,9 +149,9 @@
 
 static inline {
-	long int ?\?( int x, unsigned int y ) { __CFA_EXP__(); }
+	int ?\?( int x, unsigned int y ) { __CFA_EXP__(); }
 	long int ?\?( long int x, unsigned long int y ) { __CFA_EXP__(); }
 	long long int ?\?( long long int x, unsigned long long int y ) { __CFA_EXP__(); }
 	// unsigned computation may be faster and larger
-	unsigned long int ?\?( unsigned int x, unsigned int y ) { __CFA_EXP__(); }
+	unsigned int ?\?( unsigned int x, unsigned int y ) { __CFA_EXP__(); }
 	unsigned long int ?\?( unsigned long int x, unsigned long int y ) { __CFA_EXP__(); }
 	unsigned long long int ?\?( unsigned long long int x, unsigned long long int y ) { __CFA_EXP__(); }
@@ -176,8 +176,8 @@
 
 static inline {
-	long int ?\=?( int & x, unsigned int y ) { x = x \ y; return x; }
+	int ?\=?( int & x, unsigned int y ) { x = x \ y; return x; }
 	long int ?\=?( long int & x, unsigned long int y ) { x = x \ y; return x; }
 	long long int ?\=?( long long int & x, unsigned long long int y ) { x = x \ y; return x; }
-	unsigned long int ?\=?( unsigned int & x, unsigned int y ) { x = x \ y; return x; }
+	unsigned int ?\=?( unsigned int & x, unsigned int y ) { x = x \ y; return x; }
 	unsigned long int ?\=?( unsigned long int & x, unsigned long int y ) { x = x \ y; return x; }
 	unsigned long long int ?\=?( unsigned long long int & x, unsigned long long int y ) { x = x \ y; return x; }