summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Sander <oliver.sander@tu-dresden.de>2018-11-30 17:55:48 +0100
committerAlbert Astals Cid <tsdgeos@yahoo.es>2018-12-06 17:31:41 +0000
commit27954f7d44275d4fc458da680bba89ab749d3c07 (patch)
tree0de83bbc324530047f4491fcc38e46d155121544
parent9414cc632c17afb7b78c559447b2044268f06cfc (diff)
Move definition of type Goffset from gtypes.h to gfile.h
Because it is used for file-related stuff.
-rw-r--r--goo/gfile.h3
-rw-r--r--goo/gtypes.h1
-rw-r--r--poppler/Error.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/goo/gfile.h b/goo/gfile.h
index daf99dca..2bbf98d2 100644
--- a/goo/gfile.h
+++ b/goo/gfile.h
@@ -80,6 +80,9 @@ extern "C" {
class GooString;
+/* Integer type for all file offsets and file sizes */
+typedef long long Goffset;
+
//------------------------------------------------------------------------
// Append a file name to a path string. <path> may be an empty
diff --git a/goo/gtypes.h b/goo/gtypes.h
index 922cf905..10fdf82d 100644
--- a/goo/gtypes.h
+++ b/goo/gtypes.h
@@ -35,6 +35,5 @@ typedef unsigned char Guchar;
typedef unsigned short Gushort;
typedef unsigned int Guint;
typedef unsigned long Gulong;
-typedef long long Goffset;
#endif
diff --git a/poppler/Error.h b/poppler/Error.h
index 50c91100..a1c8ee96 100644
--- a/poppler/Error.h
+++ b/poppler/Error.h
@@ -29,7 +29,7 @@
#include <stdarg.h>
#include "poppler-config.h"
-#include "goo/gtypes.h"
+#include "goo/gfile.h"
#include "goo/GooString.h"
enum ErrorCategory {