commit 35dcc67558b63d08c47cd4bb3f989d7a9b77b884
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 10 21:02:15 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 10 21:02:15 2016 +0000
tree 697716e5257c46ca1bf30432cb6abe289910e9c6
parent 041245bc0195fce8418a755c5e3be18e0d202f7d
parent 2923347474df7d73d455d21e21d530b6306371cf

Merge "define LOG_TAG before including android/log.h"

otherlibs/highgui/cvcap_socket.cpp

diff --git a/otherlibs/highgui/cvcap_socket.cpp b/otherlibs/highgui/cvcap_socket.cpp
index 6e2f01e..96e4f0d 100644
--- a/otherlibs/highgui/cvcap_socket.cpp
+++ b/otherlibs/highgui/cvcap_socket.cpp
@@ -47,15 +47,15 @@
 // capture video from a socket connection
 //
 
+#define LOG_TAG "CVJNI"
+#define LOGV(...) __android_log_print(ANDROID_LOG_SILENT, LOG_TAG, __VA_ARGS__)
+
 #include "_highgui.h"
 #include <android/log.h>
 #include <errno.h>
 #include <netdb.h>
 #include <unistd.h>
 
-#define LOGV(...) __android_log_print(ANDROID_LOG_SILENT, LOG_TAG, __VA_ARGS__)
-#define LOG_TAG "CVJNI"
-
 #ifdef NDEBUG
 #define CV_WARN(message)
 #else