summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Corino <mcorino@remedy.nl>2015-06-02 10:53:22 +0200
committerMartin Corino <mcorino@remedy.nl>2015-06-02 10:53:22 +0200
commit9fd86dc7a42aea70ea0fec17286c16e27d05e818 (patch)
treec0c973d67336cf9479338040b974384c239c8eb4
parentcfb1dc00fd905b7bccff6a15f6352d7f613e3867 (diff)
downloadATCD-9fd86dc7a42aea70ea0fec17286c16e27d05e818.tar.gz
Prevent macro redefinitions with MSVC14.
* ACE/ace/config-win32-msvc.h:
-rw-r--r--ACE/ace/config-win32-msvc.h4
1 files changed, 3 insertions, 1 deletions
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