diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-03-06 18:36:55 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-03-06 18:36:55 +0000 |
| commit | 4e18ee3f0c30cced803ce851e5cc07a6fee059f5 (patch) | |
| tree | bf5e44d62dd84019cf5e2fa0457f364da296766a | |
| parent | 5a7d8ac71138b70febbd10bfaf0f92a0886eec80 (diff) | |
| download | numpy-4e18ee3f0c30cced803ce851e5cc07a6fee059f5.tar.gz | |
Fix x86 and amd64 arch setup with Sun compilers on opensolaris.
| -rw-r--r-- | numpy/core/include/numpy/npy_cpu.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h index fa8830d04..d0586d753 100644 --- a/numpy/core/include/numpy/npy_cpu.h +++ b/numpy/core/include/numpy/npy_cpu.h @@ -12,12 +12,18 @@ #ifndef _NPY_CPUARCH_H_ #define _NPY_CPUARCH_H_ -#if defined ( _i386_ ) || defined( __i386__ ) - /* __i386__ is defined by gcc and Intel compiler on Linux, _i386_ by - VS compiler */ +#if defined ( _i386_ ) || defined( __i386__ ) || defined(i386) + /* + * __i386__ is defined by gcc and Intel compiler on Linux, + * _i386_ by VS compiler, + * i386 by Sun compilers on opensolaris at least + */ #define NPY_CPU_X86 -#elif defined(__x86_64__) || defined(__amd64__) - /* both __x86_64__ and __amd64__ are defined by gcc */ +#elif defined(__x86_64__) || defined(__amd64__) || defined(__x86_64) + /* + * both __x86_64__ and __amd64__ are defined by gcc + * __x86_64 defined by sun compiler on opensolaris at least + */ #define NPY_CPU_AMD64 #elif defined(__ppc__) || defined(__powerpc__) /* __ppc__ is defined by gcc, I remember having seen __powerpc__ once, |