Merge pull request #3534 from taka-no-me:build_fixes

modules/core/include/opencv2/core/internal.hpp

@@ -153,7 +153,7 @@ CV_INLINE IppiSize ippiSize(const cv::Size & _size)
 # include "arm_neon.h"
 # define CV_NEON 1
 # define CPU_HAS_NEON_FEATURE (true)
-#elif defined(__ARM_NEON__)
+#elif defined(__ARM_NEON__) || defined(__ARM_NEON)
 #  include <arm_neon.h>
 #  define CV_NEON 1
 #  define CPU_HAS_NEON_FEATURE (true)

modules/core/src/cmdparser.cpp

@@ -7,6 +7,7 @@ using namespace std;
 using namespace cv;
 
 namespace {
+#if 0
 void helpParser()
 {
     printf("\nThe CommandLineParser class is designed for command line arguments parsing\n"
@@ -50,6 +51,7 @@ void helpParser()
            "                          It also works with 'unsigned int', 'double', and 'float' types \n"
            );
 }
+#endif
 
 vector<string> split_string(const string& str, const string& delimiters)
 {