Undefine OpenCV in c source files to avoid compilation failure using new OpenCV.

src/activation_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "activation_layer.h"
 #include "utils.h"
 #include "cuda.h"

src/activations.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "activations.h"
 
 #include <math.h>

src/avgpool_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "avgpool_layer.h"
 #include "cuda.h"
 #include <stdio.h>

src/batchnorm_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "convolutional_layer.h"
 #include "batchnorm_layer.h"
 #include "blas.h"

src/blas.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "blas.h"
 
 #include <math.h>

src/box.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "box.h"
 #include <stdio.h>
 #include <math.h>

src/connected_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "connected_layer.h"
 #include "convolutional_layer.h"
 #include "batchnorm_layer.h"

src/convolutional_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "convolutional_layer.h"
 #include "utils.h"
 #include "batchnorm_layer.h"

src/cost_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "cost_layer.h"
 #include "utils.h"
 #include "cuda.h"

src/crnn_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "crnn_layer.h"
 #include "convolutional_layer.h"
 #include "utils.h"

src/crop_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "crop_layer.h"
 #include "cuda.h"
 #include <stdio.h>

src/data.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "data.h"
 #include "utils.h"
 #include "image.h"

src/deconvolutional_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "deconvolutional_layer.h"
 #include "convolutional_layer.h"
 #include "batchnorm_layer.h"

src/demo.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "network.h"
 #include "detection_layer.h"
 #include "region_layer.h"

src/detection_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "detection_layer.h"
 #include "activations.h"
 #include "softmax_layer.h"

src/dropout_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "dropout_layer.h"
 #include "utils.h"
 #include "cuda.h"

src/gemm.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "gemm.h"
 #include "utils.h"
 #include "cuda.h"

src/gru_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "gru_layer.h"
 #include "connected_layer.h"
 #include "utils.h"

src/image.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "image.h"
 #include "utils.h"
 #include "blas.h"

src/iseg_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "iseg_layer.h"
 #include "activations.h"
 #include "blas.h"

src/l2norm_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "l2norm_layer.h"
 #include "activations.h"
 #include "blas.h"

src/layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "layer.h"
 #include "cuda.h"
 

src/list.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include <stdlib.h>
 #include <string.h>
 #include "list.h"

src/local_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "local_layer.h"
 #include "utils.h"
 #include "im2col.h"

src/logistic_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "logistic_layer.h"
 #include "activations.h"
 #include "blas.h"

src/lstm_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "lstm_layer.h"
 #include "connected_layer.h"
 #include "utils.h"

src/matrix.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "matrix.h"
 #include "utils.h"
 #include "blas.h"

src/maxpool_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "maxpool_layer.h"
 #include "cuda.h"
 #include <stdio.h>

src/network.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include <stdio.h>
 #include <time.h>
 #include <assert.h>

src/normalization_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "normalization_layer.h"
 #include "blas.h"
 

src/option_list.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

src/parser.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

src/region_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "region_layer.h"
 #include "activations.h"
 #include "blas.h"

src/reorg_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "reorg_layer.h"
 #include "cuda.h"
 #include "blas.h"

src/rnn_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "rnn_layer.h"
 #include "connected_layer.h"
 #include "utils.h"

src/route_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "route_layer.h"
 #include "cuda.h"
 #include "blas.h"

src/shortcut_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "shortcut_layer.h"
 #include "cuda.h"
 #include "blas.h"

src/softmax_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "softmax_layer.h"
 #include "blas.h"
 #include "cuda.h"

src/tree.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "tree.h"

src/upsample_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "upsample_layer.h"
 #include "cuda.h"
 #include "blas.h"

src/utils.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/yolo_layer.c

@@ -1,3 +1,5 @@
+#undef OPENCV
+
 #include "yolo_layer.h"
 #include "activations.h"
 #include "blas.h"