Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
9f3cdb07
Commit
9f3cdb07
authored
Dec 28, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: fix schroedinger build with android toolchain
google's gcc doesn't understand 'restrict'. Use __restrict__
parent
937f97f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
contrib/src/schroedinger/android.patch
contrib/src/schroedinger/android.patch
+11
-0
contrib/src/schroedinger/rules.mak
contrib/src/schroedinger/rules.mak
+1
-0
No files found.
contrib/src/schroedinger/android.patch
0 → 100644
View file @
9f3cdb07
--- 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__
contrib/src/schroedinger/rules.mak
View file @
9f3cdb07
...
...
@@ -16,6 +16,7 @@ $(TARBALLS)/schroedinger-$(SCHROEDINGER_VERSION).tar.gz:
schroedinger
:
schroedinger-$(SCHROEDINGER_VERSION).tar.gz .sum-schroedinger
$(UNPACK)
$(APPLY)
$(SRC)
/schroedinger/schroedinger-notests.patch
$(APPLY)
$(SRC)
/schroedinger/android.patch
$(MOVE)
DEPS_schroedinger
=
orc
$(DEPS_orc)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment