From 1ac5ccc2f98ec29e864cda414ecb45f76979e313 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Tue, 14 Jun 2016 11:01:33 +0000
Subject: [PATCH] Fixing warning from contrib/buildserver/test_daily.sh
 concerning redefinition of EXV_SEPARATOR_STR|CHR when testing msvc builds

---
 config/config.h.cmake    | 6 +++---
 include/exiv2/exv_msvc.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/config.h.cmake b/config/config.h.cmake
index edeaee8a..22a302c7 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -1,10 +1,10 @@
 /**/
-/* config.h.  Generated by cmake from config.h.cmake.  */
+/* Generated by cmake from config.h.cmake.  */
 
-#ifdef  _MSC_VER
 #ifndef _EXV_MSVC_H_
 #define _EXV_MSVC_H_
 
+#ifdef  _MSC_VER
 #define _MSC_VER_2015 1900
 #define _MSC_VER_2013 1800
 #define _MSC_VER_2012 1700
@@ -351,4 +351,4 @@ typedef int pid_t;
 #include <ios>
 #include <fstream>
 #endif
-#endif
\ No newline at end of file
+#endif
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index b95f7b4e..2ce5e1c0 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -1,10 +1,10 @@
 /**/
-/* config.h.  Generated by cmake from config.h.cmake.  */
+/* exv_msvc.h */
 
-#ifdef  _MSC_VER
 #ifndef _EXV_MSVC_H_
 #define _EXV_MSVC_H_
 
+#ifdef  _MSC_VER
 #define _MSC_VER_2015 1900
 #define _MSC_VER_2013 1800
 #define _MSC_VER_2012 1700