From 9fd86dc7a42aea70ea0fec17286c16e27d05e818 Mon Sep 17 00:00:00 2001
From: Martin Corino <mcorino@remedy.nl>
Date: Tue, 2 Jun 2015 10:53:22 +0200
Subject: Prevent macro redefinitions with MSVC14.

    * ACE/ace/config-win32-msvc.h:
---
 ACE/ace/config-win32-msvc.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index dfa1f85da0c..7b4c7e6b9ee 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -99,7 +99,9 @@
 #define ACE_LACKS_NETDB_H
 #define ACE_LACKS_NET_IF_H
 #define ACE_LACKS_NETINET_IN_H
-#define ACE_LACKS_STDINT_H
+#if !defined (ACE_WIN32_VC14)
+# define ACE_LACKS_STDINT_H
+#endif
 #define ACE_LACKS_STROPTS_H
 #define ACE_LACKS_SYS_IOCTL_H
 #define ACE_LACKS_SYS_IPC_H
-- 
cgit v1.2.1