Skip to content
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.

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

Fix Android cross-compilation error #1774

Merged
merged 1 commit into from
Dec 7, 2016
Merged

Fix Android cross-compilation error #1774

merged 1 commit into from
Dec 7, 2016

Conversation

nachtgeist
Copy link
Contributor

39cb8b6 introduced a cross-compilation error
for Android where a build would fail with

[...]
pcl/common/include/pcl/pcl_macros.h:394:4: error: #error aligned_malloc not
supported on your platform
#error aligned_malloc not supported on your platform
^
pcl/common/include/pcl/pcl_macros.h:410:4: error: #error aligned_free not
supported on your platform
#error aligned_free not supported on your platform
^
[...]

This patch adds a new CPP branch for Android to pcl_macros.h. The calls to
memalign() and free() were checked against the malloc.h files from the
Android NDK r13b.

Fixes #1773

@taketwo
Copy link
Member

taketwo commented Dec 7, 2016

Hi, thanks for the fix. Could you please insert spaces before braces to match PCL style?

39cb8b6 introduced a cross-compilation error
for Android where a build would fail with

[...]
pcl/common/include/pcl/pcl_macros.h:394:4: error: #error aligned_malloc not
supported on your platform
   #error aligned_malloc not supported on your platform
    ^
pcl/common/include/pcl/pcl_macros.h:410:4: error: #error aligned_free not
supported on your platform
   #error aligned_free not supported on your platform
    ^
[...]

This patch adds a new CPP branch for Android to pcl_macros.h. The calls to
memalign() and free() were checked against the malloc.h files from the
Android NDK r13b.
@nachtgeist
Copy link
Contributor Author

sure thing

@taketwo taketwo merged commit 89da6ad into PointCloudLibrary:master Dec 7, 2016
@taketwo taketwo added this to the pcl-1.8.1 milestone Dec 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants