|
1 Patch taken from the Desktop consolidation and needed to get poppler to |
|
2 compile with the Studio compiler. |
|
3 |
|
4 This patch will not be sent upstream. |
|
5 |
|
6 diff -up poppler-0.11.3/goo/gstrtod.cc.orig poppler-0.11.3/goo/gstrtod.cc |
|
7 --- poppler-0.11.3/goo/gstrtod.cc.orig 2009-08-16 23:09:57.000000000 +0100 |
|
8 +++ poppler-0.11.3/goo/gstrtod.cc 2009-08-30 22:39:27.440190450 +0100 |
|
9 @@ -22,6 +22,9 @@ |
|
10 |
|
11 #include "gstrtod.h" |
|
12 |
|
13 +#include <stdlib.h> |
|
14 +#include <strings.h> |
|
15 +#include <locale.h> |
|
16 #include <clocale> |
|
17 #include <cerrno> |
|
18 #include <cstdlib> |
|
19 |
|
20 |
|
21 diff -up poppler-0.11.3/goo/gmem.cc.orig poppler-0.11.3/goo/gmem.cc |
|
22 --- poppler-0.11.3/goo/gmem.cc.orig 2009-08-16 23:07:09.000000000 +0100 |
|
23 +++ poppler-0.11.3/goo/gmem.cc 2009-08-31 00:06:27.657113809 +0100 |
|
24 @@ -63,7 +63,7 @@ static int gMemInUse = 0; |
|
25 |
|
26 #endif /* DEBUG_MEM */ |
|
27 |
|
28 -inline static void *gmalloc(size_t size, bool checkoverflow) GMEM_EXCEP { |
|
29 +static void *gmalloc(size_t size, bool checkoverflow) GMEM_EXCEP { |
|
30 #ifdef DEBUG_MEM |
|
31 int size1; |
|
32 char *mem; |
|
33 @@ -132,7 +132,7 @@ void *gmalloc_checkoverflow(size_t size) |
|
34 return gmalloc(size, true); |
|
35 } |
|
36 |
|
37 -inline static void *grealloc(void *p, size_t size, bool checkoverflow) GMEM_EXCEP { |
|
38 +static void *grealloc(void *p, size_t size, bool checkoverflow) GMEM_EXCEP { |
|
39 #ifdef DEBUG_MEM |
|
40 GMemHdr *hdr; |
|
41 void *q; |
|
42 @@ -189,7 +189,7 @@ void *grealloc_checkoverflow(void *p, si |
|
43 return grealloc(p, size, true); |
|
44 } |
|
45 |
|
46 -inline static void *gmallocn(int nObjs, int objSize, bool checkoverflow) GMEM_EXCEP { |
|
47 +static void *gmallocn(int nObjs, int objSize, bool checkoverflow) GMEM_EXCEP { |
|
48 int n; |
|
49 |
|
50 if (nObjs == 0) { |
|
51 @@ -216,7 +216,7 @@ void *gmallocn_checkoverflow(int nObjs, |
|
52 return gmallocn(nObjs, objSize, true); |
|
53 } |
|
54 |
|
55 -inline static void *gmallocn3(int a, int b, int c, bool checkoverflow) GMEM_EXCEP { |
|
56 +static void *gmallocn3(int a, int b, int c, bool checkoverflow) GMEM_EXCEP { |
|
57 int n = a * b; |
|
58 if (b <= 0 || a < 0 || a >= INT_MAX / b) { |
|
59 #if USE_EXCEPTIONS |
|
60 @@ -238,7 +238,7 @@ void *gmallocn3_checkoverflow(int a, int |
|
61 return gmallocn3(a, b, c, true); |
|
62 } |
|
63 |
|
64 -inline static void *greallocn(void *p, int nObjs, int objSize, bool checkoverflow) GMEM_EXCEP { |
|
65 +static void *greallocn(void *p, int nObjs, int objSize, bool checkoverflow) GMEM_EXCEP { |
|
66 int n; |
|
67 |
|
68 if (nObjs == 0) { |
|
69 |