win build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58261 954022d7-b5bf-4e40-9824-e11837661b57

Common/DocxFormat/Source/Base/ASCString.h

@@ -8,12 +8,32 @@
 
 #include "unicode_util.h"
 #include <stdlib.h>
-#include <stdint.h>
+
+
 #include <string>
 #include <string.h>
 #include <string>
 #include <vector>
 
+#ifndef _WIN32
+#include <stdint.h>
+#ifndef itoa
+#include <cstdio>
+static void itoa (int value, char *str, int base) {
+    switch (base){
+    case 10:
+        sprintf(str, "%d", value);
+        break;
+    case 16:
+        sprintf(str, "%x", value);
+        break;
+    case 8:
+        sprintf(str, "%o", value);
+        break;
+    }
+}
+#endif
+
 static bool caseInsensitiveStringCompare(const std::wstring& str1, const std::wstring& str2) {
     if (str1.size() != str2.size()) {
         return false;
@@ -142,7 +162,7 @@ static bool stringWStringToUtf16 (const std::wstring& aSrc, std::vector<UTF16> &
             return true;
 #endif
 }
-
+#endif // _WIN32
 
 // When using VC, turn off browser references
 // Turn off unavoidable compiler warnings
@@ -4250,22 +4270,7 @@ typedef const wchar_t* LPCWSTR;
 #endif // _WIN32
 
 
-#ifndef itoa
-#include <cstdio>
-static void itoa (int value, char *str, int base) {
-    switch (base){
-    case 10:
-        sprintf(str, "%d", value);
-        break;
-    case 16:
-        sprintf(str, "%x", value);
-        break;
-    case 8:
-        sprintf(str, "%o", value);
-        break;
-    }
-}
-#endif
+
 
 
 #endif // ASCSTRING_H

Common/DocxFormat/Source/Common/SimpleTypes_Shared.h

@@ -715,7 +715,11 @@ namespace SimpleTypes
 
 		virtual unsigned int FromString(CString &sValue)
 		{
+#ifndef _WIN32
             this->m_eValue = _wtoi( sValue.c_str() );
+#else
+			this->m_eValue = _wtoi( sValue );
+#endif
 
             return this->m_eValue;
 		}