summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k/types.h
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-02-29 13:56:44 +0100
committerMarian Balakowicz <m8@semihalf.com>2008-02-29 13:56:44 +0100
commite18489e8c27e843e337258fb00f2652ff0f43b92 (patch)
tree2a3b2afa224e61cb7f1206a1641007e526d25160 /include/asm-m68k/types.h
parent75fa002c47171b73fb4c1f2c2fe4d6391c136276 (diff)
parentb29661fc1151077776454288051bc9a488351ce8 (diff)
downloadtalos-obmc-uboot-e18489e8c27e843e337258fb00f2652ff0f43b92.tar.gz
talos-obmc-uboot-e18489e8c27e843e337258fb00f2652ff0f43b92.zip
Merge branch 'master' of git://www.denx.de/git/u-boot into new-image
Diffstat (limited to 'include/asm-m68k/types.h')
-rw-r--r--include/asm-m68k/types.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-m68k/types.h b/include/asm-m68k/types.h
index e673cb085d..e944d3fd19 100644
--- a/include/asm-m68k/types.h
+++ b/include/asm-m68k/types.h
@@ -14,9 +14,9 @@ typedef unsigned short __u16;
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
+#if defined(__GNUC__)
+__extension__ typedef __signed__ long long __s64;
+__extension__ typedef unsigned long long __u64;
#endif
typedef struct {
OpenPOWER on IntegriCloud