summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-08 13:30:38 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-08 13:30:38 -0700
commit54c1bfc39ccab6da06b78604c48dcc42ba1c3f35 (patch)
treec0bee5414dbffdfd5fcfcedd2903448c1d21fd27 /core
parentbad79b3b02c9c56cf4eef436116bc9ad1bfb65b0 (diff)
downloadpdfium-54c1bfc39ccab6da06b78604c48dcc42ba1c3f35.tar.xz
Merge to XFA: Fix compilation under chromium checkouts.
Original Review URL: https://codereview.chromium.org/1132163002 R=thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1128933004
Diffstat (limited to 'core')
-rw-r--r--core/include/fxcrt/fx_system.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h
index 50d3344a89..e1e957a52d 100644
--- a/core/include/fxcrt/fx_system.h
+++ b/core/include/fxcrt/fx_system.h
@@ -191,16 +191,8 @@ void FXSYS_vsnprintf(char *str, size_t size, const char* fmt, va_list ap);
FXSYS_FILE* FXSYS_wfopen(FX_LPCWSTR filename, FX_LPCWSTR mode);
#endif
-#ifdef __cplusplus
-} // extern "C"
-#include "../../../third_party/base/numerics/safe_conversions.h"
-#define FXSYS_strlen(ptr) pdfium::base::checked_cast<FX_STRSIZE>(strlen(ptr))
-#define FXSYS_wcslen(ptr) pdfium::base::checked_cast<FX_STRSIZE>(wcslen(ptr))
-extern "C" {
-#else
#define FXSYS_strlen(ptr) ((FX_STRSIZE)strlen(ptr))
#define FXSYS_wcslen(ptr) ((FX_STRSIZE)wcslen(ptr))
-#endif
#define FXSYS_wcscmp wcscmp
#define FXSYS_wcschr wcschr