diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-26 16:24:49 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-27 01:04:13 +0000 |
| commit | 698aed79d6ad6e8e3a0c7a500c108d69f944b82d (patch) | |
| tree | fbf7e66e0a2ec096561cd0ba5d3c4d577cd64667 /core/fpdfdoc/cpdf_filespec_unittest.cpp | |
| parent | 3070e94f608f36e7312fad2d471e3d7546f82ca2 (diff) | |
| download | pdfium-698aed79d6ad6e8e3a0c7a500c108d69f944b82d.tar.xz | |
Cleanup FX macros
This CL renames the FX_OS defines to have _OS_ in their names and drops
the _DESKTOP suffix. The FXM defines have been changed to just FX.
Change-Id: Iab172fba541713b5f6d14fb8098baf68e3364c74
Reviewed-on: https://pdfium-review.googlesource.com/14833
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfdoc/cpdf_filespec_unittest.cpp')
| -rw-r--r-- | core/fpdfdoc/cpdf_filespec_unittest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/fpdfdoc/cpdf_filespec_unittest.cpp b/core/fpdfdoc/cpdf_filespec_unittest.cpp index 8d151c9dd8..5537473e2c 100644 --- a/core/fpdfdoc/cpdf_filespec_unittest.cpp +++ b/core/fpdfdoc/cpdf_filespec_unittest.cpp @@ -22,7 +22,7 @@ TEST(cpdf_filespec, EncodeDecodeFileName) { {L"", L""}, // only file name. {L"test.pdf", L"test.pdf"}, -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ // With drive identifier. {L"r:\\pdfdocs\\spec.pdf", L"/r/pdfdocs/spec.pdf"}, // Relative path. @@ -33,7 +33,7 @@ TEST(cpdf_filespec, EncodeDecodeFileName) { {L"\\\\pdfdocs\\spec.pdf", L"/pdfdocs/spec.pdf"}, // Network resource name. It is not supported yet. // {L"pclib/eng:\\pdfdocs\\spec.pdf", L"/pclib/eng/pdfdocs/spec.pdf"}, -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ // Absolute path with colon separator. {L"Mac HD:PDFDocs:spec.pdf", L"/Mac HD/PDFDocs/spec.pdf"}, // Relative path with colon separator. @@ -60,10 +60,10 @@ TEST(cpdf_filespec, GetFileName) { { // String object. pdfium::NullTermWstrFuncTestData test_data = { -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ L"/C/docs/test.pdf", L"C:\\docs\\test.pdf" -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ L"/Mac HD/docs/test.pdf", L"Mac HD:docs:test.pdf" #else @@ -78,13 +78,13 @@ TEST(cpdf_filespec, GetFileName) { { // Dictionary object. pdfium::NullTermWstrFuncTestData test_data[5] = { -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ {L"/C/docs/test.pdf", L"C:\\docs\\test.pdf"}, {L"/D/docs/test.pdf", L"D:\\docs\\test.pdf"}, {L"/E/docs/test.pdf", L"E:\\docs\\test.pdf"}, {L"/F/docs/test.pdf", L"F:\\docs\\test.pdf"}, {L"/G/docs/test.pdf", L"G:\\docs\\test.pdf"}, -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ {L"/Mac HD/docs1/test.pdf", L"Mac HD:docs1:test.pdf"}, {L"/Mac HD/docs2/test.pdf", L"Mac HD:docs2:test.pdf"}, {L"/Mac HD/docs3/test.pdf", L"Mac HD:docs3:test.pdf"}, @@ -123,10 +123,10 @@ TEST(cpdf_filespec, GetFileName) { TEST(cpdf_filespec, SetFileName) { pdfium::NullTermWstrFuncTestData test_data = { -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ L"C:\\docs\\test.pdf", L"/C/docs/test.pdf" -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ L"Mac HD:docs:test.pdf", L"/Mac HD/docs/test.pdf" #else |