Chromium Code Reviews| Index: src/trusted/service_runtime/include/bits/wordsize.h |
| diff --git a/src/trusted/service_runtime/include/bits/wordsize.h b/src/trusted/service_runtime/include/bits/wordsize.h |
| index e1a468c4dfb55568127db5b1fa1e7456b787b90b..55da275c8f60f43c08cc428d83c2764db55ab9d0 100644 |
| --- a/src/trusted/service_runtime/include/bits/wordsize.h |
| +++ b/src/trusted/service_runtime/include/bits/wordsize.h |
| @@ -12,12 +12,13 @@ |
| #ifndef NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_INCLUDE_BITS_WORDSIZE_H_ |
| #define NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_INCLUDE_BITS_WORDSIZE_H_ |
| -#if defined(__powerpc64__) || defined(__s390x__) || defined(__arch64__) || \ |
| - defined(__sparcv9) || defined(__x86_64__) || defined(_AMD64_) || \ |
| - defined(_M_AMD64) |
| -#define __WORDSIZE 64 |
| -#else |
| -#define __WORDSIZE 32 |
| -#endif |
| - |
| +#if !defined(__WORDSIZE) |
| +# if defined(__powerpc64__) || defined(__s390x__) || defined(__arch64__) || \ |
| + defined(__sparcv9) || defined(__x86_64__) || defined(_AMD64_) || \ |
| + defined(_M_AMD64) |
| +# define __WORDSIZE 64 |
| +# else |
| +# define __WORDSIZE 32 |
| +# endif |
| #endif |
| +#endif /* NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_INCLUDE_BITS_WORDSIZE_H_ */ |
|
Mark Seaborn
2012/09/18 03:24:34
Please keep an empty line before this header's clo
petarj
2012/09/19 17:27:51
Done.
|