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>

1 files changed, 10 insertions, 10 deletions

diff --git a/fpdfsdk/fpdfannot_embeddertest.cpp b/fpdfsdk/fpdfannot_embeddertest.cpp
index a2127b299c..34643dfb48 100644
--- a/fpdfsdk/fpdfannot_embeddertest.cpp
+++ b/fpdfsdk/fpdfannot_embeddertest.cpp
@@ -306,11 +306,11 @@ TEST_F(FPDFAnnotEmbeddertest, AddAndSaveUnderlineAnnotation) {
 }
 
 TEST_F(FPDFAnnotEmbeddertest, ModifyRectQuadpointsWithAP) {
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5_original[] = "63af8432fab95a67cdebb7cd0e514941";
   const char md5_modified_highlight[] = "aec26075011349dec9bace891856b5f2";
   const char md5_modified_square[] = "057f57a32be95975775e5ec513fdcb56";
-#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
   const char md5_original[] = "ade6762a70e85605546ce067e7d2148f";
   const char md5_modified_highlight[] = "fb8440ed1a070b53ed5598ce7451cfad";
   const char md5_modified_square[] = "7925f6726b343393f258e8b4e93dd65d";
@@ -481,12 +481,12 @@ TEST_F(FPDFAnnotEmbeddertest, RemoveAnnotation) {
 }
 
 TEST_F(FPDFAnnotEmbeddertest, AddAndModifyPath) {
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5_original[] = "c35408717759562d1f8bf33d317483d2";
   const char md5_modified_path[] = "cf3cea74bd46497520ff6c4d1ea228c8";
   const char md5_two_paths[] = "e8994452fc4385337bae5522354e10ff";
   const char md5_new_annot[] = "ee5372b31fede117fc83b9384598aa25";
-#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
   const char md5_original[] = "4f64add0190ede63f7bb9eb1e2e83edb";
   const char md5_modified_path[] = "681f0d0738dded0722e146f6c219bfac";
   const char md5_two_paths[] = "67c7e90fc3b64e20f6b69a1744f7f4f0";
@@ -660,11 +660,11 @@ TEST_F(FPDFAnnotEmbeddertest, ModifyAnnotationFlags) {
 }
 
 TEST_F(FPDFAnnotEmbeddertest, AddAndModifyImage) {
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5_original[] = "c35408717759562d1f8bf33d317483d2";
   const char md5_new_image[] = "ff012f5697436dfcaec25b32d1333596";
   const char md5_modified_image[] = "86cf8cb2755a7a2046a543e66d9c1e61";
-#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
   const char md5_original[] = "4f64add0190ede63f7bb9eb1e2e83edb";
   const char md5_new_image[] = "6fb176c20996cc554d0210d8c8b6138f";
   const char md5_modified_image[] = "546959714dfb0dcd7e7b00259e8d178c";
@@ -739,11 +739,11 @@ TEST_F(FPDFAnnotEmbeddertest, AddAndModifyImage) {
 }
 
 TEST_F(FPDFAnnotEmbeddertest, AddAndModifyText) {
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5_original[] = "c35408717759562d1f8bf33d317483d2";
   const char md5_new_text[] = "e5680ed048c2cfd9a1d27212cdf41286";
   const char md5_modified_text[] = "79f5cfb0b07caaf936f65f6a7a57ce77";
-#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
   const char md5_original[] = "4f64add0190ede63f7bb9eb1e2e83edb";
   const char md5_new_text[] = "998abae4962f8f41e094e7612d8339fc";
   const char md5_modified_text[] = "e89b82ca4589b8f0b45fff42ca3a96a4";
@@ -871,9 +871,9 @@ TEST_F(FPDFAnnotEmbeddertest, GetSetStringValue) {
   FPDF_ClosePage(page);
 
   // Open the saved annotation.
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5[] = "4d64e61c9c0f8c60ab3cc3234bb73b1c";
-#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
   const char md5[] = "0e3710ea6476f5bcba2cd39eb42d54e2";
 #else
   const char md5[] = "831a3c465a56d2e0c89aef7bdf15306a";