diff options
| author | Matthew Vernon <matthew@debian.org> | 2015-11-21 12:03:44 +0000 |
|---|---|---|
| committer | Matthew Vernon <matthew@debian.org> | 2015-11-21 12:03:44 +0000 |
| commit | d9aaaf6dc5a7494b04e600f1e7d3da561aff0daf (patch) | |
| tree | e1245867d3733b5deaf4e41a88a080c3a0b4f59e /sljit/sljitConfigInternal.h | |
| parent | f4b7aba2e8c3cb8ba30dd028cd7e60077e229f53 (diff) | |
| parent | 36d56c1e13c6d0159d44a9c1c93a610d0981bc06 (diff) | |
tidy up conflict
Diffstat (limited to 'sljit/sljitConfigInternal.h')
| -rw-r--r-- | sljit/sljitConfigInternal.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sljit/sljitConfigInternal.h b/sljit/sljitConfigInternal.h index 8219e73..16175f0 100644 --- a/sljit/sljitConfigInternal.h +++ b/sljit/sljitConfigInternal.h @@ -125,7 +125,11 @@ #elif defined(__mips64) #define SLJIT_CONFIG_MIPS_64 1 #elif defined(__sparc__) || defined(__sparc) -#define SLJIT_CONFIG_SPARC_32 1 +# if defined(__arch64__) +# define SLJIT_CONFIG_UNSUPPORTED 1 +# else +# define SLJIT_CONFIG_SPARC_32 1 +# endif #elif defined(__tilegx__) #define SLJIT_CONFIG_TILEGX 1 #else |