From 2ae80f52cec81c080515724f99deb06b2fee3cc9 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 3 Apr 2017 14:58:55 -0400 Subject: Drop FXSYS_ from wide string methods This Cl drops the FXSYS_ from wide string methods which are the same on all platforms. Bug: pdfium:694 Change-Id: I46a7af5913e7897f7c4ba712a76540c12105818f Reviewed-on: https://pdfium-review.googlesource.com/3611 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fxcrt/cfx_widestring.cpp | 2 +- core/fxcrt/fx_system.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'core') diff --git a/core/fxcrt/cfx_widestring.cpp b/core/fxcrt/cfx_widestring.cpp index c3be23a8df..2298db68f9 100644 --- a/core/fxcrt/cfx_widestring.cpp +++ b/core/fxcrt/cfx_widestring.cpp @@ -858,7 +858,7 @@ CFX_WideString CFX_WideString::FromUTF16LE(const unsigned short* wstr, int CFX_WideString::Compare(const wchar_t* lpsz) const { if (m_pData) - return FXSYS_wcscmp(m_pData->m_String, lpsz); + return wcscmp(m_pData->m_String, lpsz); return (!lpsz || lpsz[0] == 0) ? 0 : -1; } diff --git a/core/fxcrt/fx_system.h b/core/fxcrt/fx_system.h index 15b81f4778..dcf70451c9 100644 --- a/core/fxcrt/fx_system.h +++ b/core/fxcrt/fx_system.h @@ -171,12 +171,6 @@ extern "C" { #define FXSYS_wcslen(ptr) ((FX_STRSIZE)wcslen(ptr)) #endif // __cplusplus -#define FXSYS_wcscmp wcscmp -#define FXSYS_wcsstr wcsstr -#define FXSYS_wcsncmp wcsncmp -#define FXSYS_vswprintf vswprintf -#define FXSYS_mbstowcs mbstowcs -#define FXSYS_wcstombs wcstombs #define FXSYS_memcmp memcmp #define FXSYS_memcpy memcpy #define FXSYS_memmove memmove -- cgit v1.2.3