Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux

[cascardo/linux.git] / arch / mn10300 / include / asm / posix_types.h

diff --git a/arch/mn10300/include/asm/posix_types.h b/arch/mn10300/include/asm/posix_types.h
index 077567c..56ffbc1 100644 (file)
--- a/arch/mn10300/include/asm/posix_types.h
+++ b/arch/mn10300/include/asm/posix_types.h
@@ -25,8 +25,13 @@ typedef int          __kernel_pid_t;
 typedef unsigned short __kernel_ipc_pid_t;
 typedef unsigned short __kernel_uid_t;
 typedef unsigned short __kernel_gid_t;
+#if __GNUC__ == 4
+typedef unsigned int   __kernel_size_t;
+typedef signed int     __kernel_ssize_t;
+#else
 typedef unsigned long  __kernel_size_t;
-typedef long           __kernel_ssize_t;
+typedef signed long    __kernel_ssize_t;
+#endif
 typedef int            __kernel_ptrdiff_t;
 typedef long           __kernel_time_t;
 typedef long           __kernel_suseconds_t;