diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-01-28 19:49:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-01-28 19:49:46 +0400 |
| commit | 780463cc252d23b90184bfe1986dd5851fe760a5 (patch) | |
| tree | 682e845e2625f9afc7ada9f824b7e9f83d08ea4e /storage/connect/domdoc.cpp | |
| parent | 501fc7642f68c4f5ba827d9fb578e11c42939228 (diff) | |
| download | mariadb-git-780463cc252d23b90184bfe1986dd5851fe760a5.tar.gz | |
Adding detection of msxml library version:
msxml2, msxml3, msxml4, msxml6
modified:
storage/connect/CMakeLists.txt
storage/connect/domdoc.cpp
Diffstat (limited to 'storage/connect/domdoc.cpp')
| -rw-r--r-- | storage/connect/domdoc.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/connect/domdoc.cpp b/storage/connect/domdoc.cpp index c30cae754f0..96fc5dc57e4 100644 --- a/storage/connect/domdoc.cpp +++ b/storage/connect/domdoc.cpp @@ -10,8 +10,12 @@ #import "msxml2.dll" //Does not exist on Vista
#elif defined(MSX3)
#import "msxml3.dll" //Causes error C2872: DOMNodeType: ambiguous symbol ??
+#elif defined(MSX4)
+#import "msxml4.dll" //Causes error C2872: DOMNodeType: ambiguous symbol ??
+#elif defined(MSX6)
+#import "msxml6.dll" //Causes error C2872: DOMNodeType: ambiguous symbol ??
#else // MSX4
-#import "msxml4.dll" //Causes error C2872: DOMNodeType: ambiguous symbol
+#error MSX? is not defined
#endif // MSX
using namespace MSXML2;
#else
|