You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by bo...@apache.org on 2010/04/11 14:17:34 UTC
svn commit: r932877 -
/xerces/c/branches/xerces-3.1/src/xercesc/util/PlatformUtils.cpp
Author: borisk
Date: Sun Apr 11 12:17:34 2010
New Revision: 932877
URL: http://svn.apache.org/viewvc?rev=932877&view=rev
Log:
Don't include cpuid.h if we are using intrin.h (XERCESC-1912).
Modified:
xerces/c/branches/xerces-3.1/src/xercesc/util/PlatformUtils.cpp
Modified: xerces/c/branches/xerces-3.1/src/xercesc/util/PlatformUtils.cpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-3.1/src/xercesc/util/PlatformUtils.cpp?rev=932877&r1=932876&r2=932877&view=diff
==============================================================================
--- xerces/c/branches/xerces-3.1/src/xercesc/util/PlatformUtils.cpp (original)
+++ xerces/c/branches/xerces-3.1/src/xercesc/util/PlatformUtils.cpp Sun Apr 11 12:17:34 2010
@@ -37,7 +37,7 @@
#if HAVE_SYS_TIMEB_H
# include <sys/timeb.h>
#endif
-#if HAVE_CPUID_H
+#if HAVE_CPUID_H && !XERCES_HAVE_INTRIN_H
# include <cpuid.h>
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org