fix compilation on aarch64 (e.g. Ubuntu 18.04.4 on Raspberry Pi 4)

UbiquityRobotics · Mar 13, 2020 · 3097f1a · 3097f1a
1 parent 3209cd8
commit 3097f1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/RaspiCamControl.cpp b/src/RaspiCamControl.cpp
@@ -26,7 +26,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifdef __arm__
+#if defined(__arm__) || defined(__aarch64__)
 
 #include <memory.h>
 #include <stdio.h>
@@ -919,4 +919,4 @@ void raspicamcontrol_check_configuration(int min_gpu_mem) {
     vcos_log_error("Failed to run camera app. Please check for firmware updates\n");
 }
 
-#endif  // __arm__
+#endif  // __arm__ || __aarch64__
diff --git a/src/raspicam_node.cpp b/src/raspicam_node.cpp
@@ -37,7 +37,7 @@ int main(int argc, char** argv) {
 
 #endif  // __x86_64__
 
-#ifdef __arm__
+#if defined(__arm__) || defined(__aarch64__)
 
 // We use some GNU extensions (basename)
 #include <memory.h>
@@ -1380,4 +1380,4 @@ int main(int argc, char** argv) {
   ros::shutdown();
 }
 
-#endif  // __arm__
+#endif  // __arm__ || __aarch64__