Fixes for correct build with C++

Author: ssvb

arm-neon.h

@@ -26,6 +26,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void aligned_block_copy_neon(int64_t * __restrict dst,
                              int64_t * __restrict src,
                              int                  size);
@@ -52,5 +56,8 @@ void aligned_block_fill_neon(int64_t * __restrict dst,
                              int64_t * __restrict src,
                              int                  size);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif

asm-opt.c

@@ -24,6 +24,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include "asm-opt.h"
 
 #if defined(__linux__) || defined(ANDROID) || defined(__ANDROID__)
@@ -40,7 +41,7 @@
 #define FEATURES_ID "?"
 #endif
 
-static int check_feature (const char *buffer, const char *feature)
+static int check_feature (char *buffer, const char *feature)
 {
   char *p;
   if (*feature == 0)

main.c

@@ -220,7 +220,6 @@ void latency_bench(int size, int count)
 
 int main(void)
 {
-    int dummy;
     int64_t *srcbuf, *dstbuf, *tmpbuf;
     void *poolbuf = alloc_four_nonaliased_buffers((void **)&srcbuf, SIZE,
                                                   (void **)&dstbuf, SIZE,
@@ -238,9 +237,12 @@ int main(void)
     bandwidth_bench(dstbuf, srcbuf, tmpbuf, SIZE, BLOCKSIZE, "    ");
     free(poolbuf);
 
-    dummy = posix_memalign((void **)&srcbuf, 128, SIZE);
-    dummy = posix_memalign((void **)&dstbuf, 128, SIZE);
-    dummy = posix_memalign((void **)&tmpbuf, 128, BLOCKSIZE);
+    if (posix_memalign((void **)&srcbuf, 128, SIZE) != 0)
+        return 1;
+    if (posix_memalign((void **)&dstbuf, 128, SIZE) != 0)
+        return 1;
+    if (posix_memalign((void **)&tmpbuf, 128, BLOCKSIZE) != 0)
+        return 1;
     memset(srcbuf, 0xCC, SIZE);
     memset(dstbuf, 0xCC, SIZE);
     memset(tmpbuf, 0xCC, BLOCKSIZE);

x86-sse2.h

@@ -26,6 +26,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void aligned_block_copy_sse2(int64_t * __restrict dst,
                              int64_t * __restrict src,
                              int                  size);
@@ -55,5 +59,8 @@ void aligned_block_fill_nt_sse2(int64_t * __restrict dst,
                                 int64_t * __restrict src,
                                 int                  size);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif