summaryrefslogtreecommitdiff
path: root/Build/source/libs/xpdf/xpdf-src/goo
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/xpdf/xpdf-src/goo')
-rw-r--r--Build/source/libs/xpdf/xpdf-src/goo/FixedPoint.h2
-rw-r--r--Build/source/libs/xpdf/xpdf-src/goo/GMutex.h1
-rw-r--r--Build/source/libs/xpdf/xpdf-src/goo/gfile.cc4
-rw-r--r--Build/source/libs/xpdf/xpdf-src/goo/gfile.h1
-rw-r--r--Build/source/libs/xpdf/xpdf-src/goo/gmem.cc8
-rw-r--r--Build/source/libs/xpdf/xpdf-src/goo/gmem.h6
6 files changed, 16 insertions, 6 deletions
diff --git a/Build/source/libs/xpdf/xpdf-src/goo/FixedPoint.h b/Build/source/libs/xpdf/xpdf-src/goo/FixedPoint.h
index 438343fc585..a0baa70b61f 100644
--- a/Build/source/libs/xpdf/xpdf-src/goo/FixedPoint.h
+++ b/Build/source/libs/xpdf/xpdf-src/goo/FixedPoint.h
@@ -36,7 +36,7 @@ public:
FixedPoint(const FixedPoint &x) { val = x.val; }
FixedPoint(double x) { val = (int)(x * (1 << fixptShift) + 0.5); }
FixedPoint(int x) { val = x << fixptShift; }
- FixedPoint(long x) { val = x << fixptShift; }
+ FixedPoint(long x) { val = (int)x << fixptShift; }
operator float()
{ return (float) val * ((float)1 / (float)(1 << fixptShift)); }
diff --git a/Build/source/libs/xpdf/xpdf-src/goo/GMutex.h b/Build/source/libs/xpdf/xpdf-src/goo/GMutex.h
index d73366bddd0..aef4aec4859 100644
--- a/Build/source/libs/xpdf/xpdf-src/goo/GMutex.h
+++ b/Build/source/libs/xpdf/xpdf-src/goo/GMutex.h
@@ -12,6 +12,7 @@
#ifndef GMUTEX_H
#define GMUTEX_H
+#include <aconf.h>
#ifdef _WIN32
# include <windows.h>
# include <intrin.h>
diff --git a/Build/source/libs/xpdf/xpdf-src/goo/gfile.cc b/Build/source/libs/xpdf/xpdf-src/goo/gfile.cc
index 40cf9054153..e7112b2039d 100644
--- a/Build/source/libs/xpdf/xpdf-src/goo/gfile.cc
+++ b/Build/source/libs/xpdf/xpdf-src/goo/gfile.cc
@@ -14,6 +14,8 @@
#include <aconf.h>
#ifdef _WIN32
+# undef WIN32_LEAN_AND_MEAN
+# include <windows.h>
# include <time.h>
# include <direct.h>
#else
@@ -613,7 +615,7 @@ FILE *openFile(const char *path, const char *mode) {
}
}
wPath[i] = (wchar_t)0;
- for (i = 0; mode[i] && i < sizeof(wMode) - 1; ++i) {
+ for (i = 0; mode[i] && i < sizeof(wMode)/sizeof(wchar_t) - 1; ++i) {
wMode[i] = (wchar_t)(mode[i] & 0xff);
}
wMode[i] = (wchar_t)0;
diff --git a/Build/source/libs/xpdf/xpdf-src/goo/gfile.h b/Build/source/libs/xpdf/xpdf-src/goo/gfile.h
index 6bd870ecb90..c0e75073ed0 100644
--- a/Build/source/libs/xpdf/xpdf-src/goo/gfile.h
+++ b/Build/source/libs/xpdf/xpdf-src/goo/gfile.h
@@ -11,6 +11,7 @@
#ifndef GFILE_H
#define GFILE_H
+#include <aconf.h>
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
diff --git a/Build/source/libs/xpdf/xpdf-src/goo/gmem.cc b/Build/source/libs/xpdf/xpdf-src/goo/gmem.cc
index 7cf9581321f..7291f2099bb 100644
--- a/Build/source/libs/xpdf/xpdf-src/goo/gmem.cc
+++ b/Build/source/libs/xpdf/xpdf-src/goo/gmem.cc
@@ -11,7 +11,9 @@
#include <stdlib.h>
#include <stddef.h>
// older compilers won't define SIZE_MAX in stdint.h without this
-#define __STDC_LIMIT_MACROS 1
+#ifndef __STDC_LIMIT_MACROS
+# define __STDC_LIMIT_MACROS 1
+#endif
#include <stdint.h>
#include <string.h>
#include <limits.h>
@@ -107,12 +109,12 @@ void *gmalloc(int size, int ignore) GMEM_EXCEP {
trl = (unsigned long *)(mem + gMemHdrSize + size1);
hdr->magic = gMemMagic;
hdr->size = size;
+ gMemLock;
if (ignore) {
hdr->index = -1;
} else {
hdr->index = gMemIndex++;
}
- gMemLock;
if (gMemTail) {
gMemTail->next = hdr;
hdr->prev = gMemTail;
@@ -233,12 +235,12 @@ void *gmalloc64(size_t size, int ignore) GMEM_EXCEP {
trl = (unsigned long *)(mem + gMemHdrSize + size1);
hdr->magic = gMemMagic;
hdr->size = size;
+ gMemLock;
if (ignore) {
hdr->index = -1;
} else {
hdr->index = gMemIndex++;
}
- gMemLock;
if (gMemTail) {
gMemTail->next = hdr;
hdr->prev = gMemTail;
diff --git a/Build/source/libs/xpdf/xpdf-src/goo/gmem.h b/Build/source/libs/xpdf/xpdf-src/goo/gmem.h
index e152199325b..87a32f0324c 100644
--- a/Build/source/libs/xpdf/xpdf-src/goo/gmem.h
+++ b/Build/source/libs/xpdf/xpdf-src/goo/gmem.h
@@ -20,7 +20,11 @@ public:
~GMemException() {}
};
-#define GMEM_EXCEP throw(GMemException)
+// This used to be:
+// #define GMEM_EXCEP throw(GMemException)
+// but the throw decl was never really very useful, and is deprecated
+// as of C++11 and illegal as of C++17.
+#define GMEM_EXCEP
#else // USE_EXCEPTIONS