diff --git a/ChangeLog b/ChangeLog
index ff76645..2b0e676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-10  Anthony Green  <green@moxielogic.com>
+
+	* include/ffi_common.h: Don't use GCCisms to define types when
+	building with the SUNPRO compiler.
+
 2013-01-10  Anthony Green  <green@moxielogic.com>
 
 	* configure.ac: Put local.exp in the right place.
diff --git a/include/ffi_common.h b/include/ffi_common.h
index c179d68..650ca69 100644
--- a/include/ffi_common.h
+++ b/include/ffi_common.h
@@ -87,7 +87,7 @@ typedef struct
 } extended_cif;
 
 /* Terse sized type definitions.  */
-#if defined(_MSC_VER) || defined(__sgi)
+#if defined(_MSC_VER) || defined(__sgi) || defined(__SUNPRO_C)
 typedef unsigned char UINT8;
 typedef signed char   SINT8;
 typedef unsigned short UINT16;