Skip to content

Android undefs #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adamski wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −1
Open

Android undefs #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33805bf
#undef's for android compatibility
adamski Mar 5, 2015
3c74912
moved undefs to stk/Stk.h
adamski Mar 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@

#ifdef __clang__
#pragma pop // -Wtautological-compare
#endif
#endif
9 changes: 9 additions & 0 deletions stk/Stk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
#include <vector>
#include <cstdlib>

#if JUCE_ANDROID
#include <sys/endian.h>
// Stk.h defines stk::swap16/32/64. This conflicts with macros in <sys/endian.h> on Android. Workaround: undefine them in the stk.h juce module header
#pragma message ("undefining swap16/32/64 macros to avoid conflict with stk header")
#undef swap16
#undef swap32
#undef swap64
#endif

/*! \namespace stk
\brief The STK namespace.

Expand Down