summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-02-23 09:09:24 -0500
committerDan Sinclair <dsinclair@chromium.org>2016-02-23 09:09:24 -0500
commit880962cb81b7a34e4b90a2ecb1992f1afb13d529 (patch)
tree0c308484095670633092b1d26e5b9335610e9935 /core
parent7f9fddeaaaddb5a898f1431e7d2d8b89d40fad87 (diff)
downloadpdfium-880962cb81b7a34e4b90a2ecb1992f1afb13d529.tar.xz
Sort includes in xfa/.
This CL sorts all the includes in the xfa/ directory. There are a lot of IWYU errors that have been fixed to make things compile again. BUG=pdfium:65 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1722803002 .
Diffstat (limited to 'core')
-rw-r--r--core/include/fxcrt/fx_basic.h2
-rw-r--r--core/include/fxcrt/fx_memory.h2
-rw-r--r--core/include/fxcrt/fx_stream.h1
3 files changed, 5 insertions, 0 deletions
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index 9b1eaa5bf5..01bb6e2c76 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -398,7 +398,9 @@ class CFX_ArrayTemplate : public CFX_BasicArray {
}
};
typedef CFX_ArrayTemplate<FX_DWORD> CFX_DWordArray;
+
#ifdef PDF_ENABLE_XFA
+typedef CFX_ArrayTemplate<CFX_WideStringC> CFX_WideStringCArray;
typedef CFX_ArrayTemplate<FX_WORD> CFX_WordArray;
typedef CFX_ArrayTemplate<FX_FLOAT> CFX_FloatArray;
typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray;
diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h
index b49305aa32..d64844e743 100644
--- a/core/include/fxcrt/fx_memory.h
+++ b/core/include/fxcrt/fx_memory.h
@@ -12,10 +12,12 @@
#ifdef __cplusplus
extern "C" {
#endif
+
// For external C libraries to malloc through PDFium. These may return NULL.
void* FXMEM_DefaultAlloc(size_t byte_size, int flags);
void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags);
void FXMEM_DefaultFree(void* pointer, int flags);
+
#ifdef __cplusplus
} // extern "C"
diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h
index b35b63544f..4e2f0f97ce 100644
--- a/core/include/fxcrt/fx_stream.h
+++ b/core/include/fxcrt/fx_stream.h
@@ -8,6 +8,7 @@
#define CORE_INCLUDE_FXCRT_FX_STREAM_H_
#include "core/include/fxcrt/fx_string.h"
+#include "core/include/fxcrt/fx_system.h"
void* FX_OpenFolder(const FX_CHAR* path);
void* FX_OpenFolder(const FX_WCHAR* path);