Commit 9f3cdb07 authored by Rafaël Carré's avatar Rafaël Carré

contrib: fix schroedinger build with android toolchain

google's gcc doesn't understand 'restrict'. Use __restrict__
parent 937f97f2
--- schroedinger/schroedinger/schroorc-dist.c.orig 2011-12-28 10:22:01.620224002 -0500
+++ schroedinger/schroedinger/schroorc-dist.c 2011-12-28 10:22:12.880224003 -0500
@@ -200,7 +200,7 @@
#define ORC_ISNAN(x) ((((x)&0x7f800000) == 0x7f800000) && (((x)&0x007fffff) != 0))
#define ORC_DENORMAL_DOUBLE(x) ((x) & ((((x)&ORC_UINT64_C(0x7ff0000000000000)) == 0) ? ORC_UINT64_C(0xfff0000000000000) : ORC_UINT64_C(0xffffffffffffffff)))
#define ORC_ISNAN_DOUBLE(x) ((((x)&ORC_UINT64_C(0x7ff0000000000000)) == ORC_UINT64_C(0x7ff0000000000000)) && (((x)&ORC_UINT64_C(0x000fffffffffffff)) != 0))
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(__ANDROID__)
#define ORC_RESTRICT restrict
#elif defined(__GNUC__) && __GNUC__ >= 4
#define ORC_RESTRICT __restrict__
...@@ -16,6 +16,7 @@ $(TARBALLS)/schroedinger-$(SCHROEDINGER_VERSION).tar.gz: ...@@ -16,6 +16,7 @@ $(TARBALLS)/schroedinger-$(SCHROEDINGER_VERSION).tar.gz:
schroedinger: schroedinger-$(SCHROEDINGER_VERSION).tar.gz .sum-schroedinger schroedinger: schroedinger-$(SCHROEDINGER_VERSION).tar.gz .sum-schroedinger
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/schroedinger/schroedinger-notests.patch $(APPLY) $(SRC)/schroedinger/schroedinger-notests.patch
$(APPLY) $(SRC)/schroedinger/android.patch
$(MOVE) $(MOVE)
DEPS_schroedinger = orc $(DEPS_orc) DEPS_schroedinger = orc $(DEPS_orc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment