diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-08-03 13:34:08 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-04 16:42:35 +0000 |
| commit | a2da7c5612f1fa26dde508da2a527a4bab381de0 (patch) | |
| tree | 84e7343808b5818305e91e4b2bf80d7764dcddef /core/fxcrt | |
| parent | 1952d17428ba5d509dc21cd8d49abba1bd2d2c5d (diff) | |
| download | pdfium-a2da7c5612f1fa26dde508da2a527a4bab381de0.tar.xz | |
Enforce recent VC++ version (2015 or later).
Remove ifdef'd code for versions we know will no longer work.
Change-Id: I036c80168f846df1b98e9df4972f84655e8418fb
Reviewed-on: https://pdfium-review.googlesource.com/10051
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcrt')
| -rw-r--r-- | core/fxcrt/fx_basic_util.cpp | 18 | ||||
| -rw-r--r-- | core/fxcrt/fx_system.h | 16 |
2 files changed, 5 insertions, 29 deletions
diff --git a/core/fxcrt/fx_basic_util.cpp b/core/fxcrt/fx_basic_util.cpp index 9491e36e71..194f6d72ef 100644 --- a/core/fxcrt/fx_basic_util.cpp +++ b/core/fxcrt/fx_basic_util.cpp @@ -127,24 +127,6 @@ float FX_atof(const CFX_WideStringC& wsStr) { return FX_atof(FX_UTF8Encode(wsStr).c_str()); } -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ && _MSC_VER < 1900 -void FXSYS_snprintf(char* str, - size_t size, - _Printf_format_string_ const char* fmt, - ...) { - va_list ap; - va_start(ap, fmt); - FXSYS_vsnprintf(str, size, fmt, ap); - va_end(ap); -} - -void FXSYS_vsnprintf(char* str, size_t size, const char* fmt, va_list ap) { - (void)_vsnprintf(str, size, fmt, ap); - if (size) - str[size - 1] = 0; -} -#endif // _FXM_PLATFORM_WINDOWS_ && _MSC_VER < 1900 - FX_FileHandle* FX_OpenFolder(const char* path) { #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ auto pData = pdfium::MakeUnique<CFindFileDataA>(); diff --git a/core/fxcrt/fx_system.h b/core/fxcrt/fx_system.h index a3dc21bb46..47d588c521 100644 --- a/core/fxcrt/fx_system.h +++ b/core/fxcrt/fx_system.h @@ -53,6 +53,10 @@ #error Sorry, can not figure out target OS. Please specify _FX_OS_ macro. #endif +#if defined(_MSC_VER) && _MSC_VER < 1900 +#error Sorry, VC++ 2015 or later is required to compile PDFium. +#endif // defined(_MSC_VER) && _MSC_VER < 1900 + #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ #include <windows.h> #include <sal.h> @@ -106,19 +110,9 @@ typedef int FX_STRSIZE; #define FX_BEZIER 0.5522847498308f // NOTE: prevent use of the return value from snprintf() since some platforms -// have different return values (e.g. windows _vsnprintf()), and provide -// versions that always NUL-terminate. -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ && _MSC_VER < 1900 -void FXSYS_snprintf(char* str, - size_t size, - _Printf_format_string_ const char* fmt, - ...); -void FXSYS_vsnprintf(char* str, size_t size, const char* fmt, va_list ap); -#else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ && _MSC_VER < 1900 +// have different return values. #define FXSYS_snprintf (void)snprintf #define FXSYS_vsnprintf (void)vsnprintf -#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ && _MSC_VER < 1900 - #define FXSYS_sprintf DO_NOT_USE_SPRINTF_DIE_DIE_DIE #define FXSYS_vsprintf DO_NOT_USE_VSPRINTF_DIE_DIE_DIE |