blob: 26a96277b084ed8473a5a6cd8e6e36e5fc2c8749 [file] [log] [blame]
Fridrich Štrba6a308e82012-08-21 13:01:37 +02001--- misc/libmspub-0.0.3/src/lib/MSPUBParser.cpp 2012-08-21 11:40:41.000000000 +0200
2+++ misc/build/libmspub-0.0.3/src/lib/MSPUBParser.cpp 2012-08-21 12:58:58.435884355 +0200
Tor Lillqvistf4d996c2012-08-21 17:01:20 +03003@@ -52,7 +52,9 @@
4 #include "TableInfo.h"
5 #include "VerticalAlign.h"
6
7+#if !defined(_MSC_VER) && !defined(BOOST_CSTDINT_HPP)
8 using boost::int32_t;
9+#endif
10 using boost::uint32_t;
11
12 libmspub::MSPUBParser::MSPUBParser(WPXInputStream *input, MSPUBCollector *collector)
Fridrich Štrba6a308e82012-08-21 13:01:37 +020013@@ -1151,7 +1151,7 @@
14 ParagraphStyle ret;
15
16 bool isList = false;
17- uint32_t bulletChar = '\u0000';
18+ uint32_t bulletChar = 0;
19 NumberingType numberingType = STANDARD_WESTERN;
20 NumberingDelimiter numberingDelimiter = NO_DELIMITER;
21 boost::optional<unsigned> numberIfRestarted;
22@@ -1256,7 +1256,7 @@
23 }
24 if (isList)
25 {
26- if (bulletChar != '\u0000')
27+ if (bulletChar)
28 {
29 ret.m_listInfo = ListInfo(bulletChar);
30 }
Tor Lillqvistf4d996c2012-08-21 17:01:20 +030031--- misc/libmspub-0.0.3/src/lib/libmspub_utils.h
32+++ misc/build/libmspub-0.0.3/src/lib/libmspub_utils.h
33@@ -43,7 +43,11 @@
34
35 typedef unsigned char uint8_t;
36 typedef unsigned short uint16_t;
37+#ifndef BOOST_CSTDINT_HPP
38 typedef unsigned uint32_t;
39+#endif
40+typedef signed char int8_t;
41+typedef short int16_t;
42 typedef int int32_t;
43 typedef unsigned __int64 uint64_t;
44