From f396403bb60a6fa7bb3d482e23d646a39e254a1c Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 07 Dec 2016 16:37:49 +0000
Subject: [PATCH] Merge branch 'master' of github.com:AlexeyAB/darknet

---
 src/data.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/data.h b/src/data.h
index 3f6ef61..618d89c 100644
--- a/src/data.h
+++ b/src/data.h
@@ -2,6 +2,10 @@
 #define DATA_H
 #include <pthread.h>
 
+#if defined(_MSC_VER) && _MSC_VER < 1900
+	#define inline __inline
+#endif
+
 #include "matrix.h"
 #include "list.h"
 #include "image.h"

--
Gitblit v1.10.0