From 4bf9cb5520d437e1dac623e29288decd9b5a50e7 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@intel.com>
Date: Tue, 17 Jan 2017 19:57:36 +0300
Subject: [PATCH] dnn: fix 'log1p' re-definition in THGeneral

---
 modules/dnn/src/torch/THGeneral.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/dnn/src/torch/THGeneral.cpp b/modules/dnn/src/torch/THGeneral.cpp
index dc56e3625..1bf0b4f89 100644
--- a/modules/dnn/src/torch/THGeneral.cpp
+++ b/modules/dnn/src/torch/THGeneral.cpp
@@ -1,14 +1,6 @@
 #if defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER
-#include "THGeneral.h"
 #include <opencv2/core.hpp>
 
-extern "C"
-{
-
-#ifndef TH_HAVE_THREAD
-#define __thread
-#endif
-
 #if defined(TH_DISABLE_HEAP_TRACKING)
 #elif (defined(__unix) || defined(_WIN32))
 #include <malloc.h>
@@ -16,6 +8,15 @@ extern "C"
 #include <malloc/malloc.h>
 #endif
 
+#include "THGeneral.h"
+
+extern "C"
+{
+
+#ifndef TH_HAVE_THREAD
+#define __thread
+#endif
+
 /* Torch Error Handling */
 static void defaultTorchErrorHandlerFunction(const char *msg, void*)
 {