commit db41a5d0e925f7abac2c0f3eaf5aa5fedf9fc9bf
author Miklos Vajna <vmiklos@collabora.co.uk> Fri Sep 17 17:45:00 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 17 17:45:00 2021 +0000
tree dac5cfca68d5a40a08d78dd5ce7f7dfe5f905aae
parent b8dca8956a07470545d1a2cad8b328a260818b49

fdrm: fix MSVC 2019 build

This fixes the following build error:

core/fdrm/fx_crypt_aes.cpp(444): error C4005: 'MAKEWORD': macro redefinition
C:\PROGRA~2\WI3CF2~1\10\Include\10.0.18362.0\shared\minwindef.h(202): note: see previous definition of 'MAKEWORD'

Just give the usual "F" prefix to the MAKEWORD macro to avoid conflict
with the Windows SDK.

Change-Id: Ie7b429de9419f5856635b2ccc45b7f3f4603d48b
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/85250
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

core/fdrm/fx_crypt_aes.cpp

diff --git a/core/fdrm/fx_crypt_aes.cpp b/core/fdrm/fx_crypt_aes.cpp
index f217022..76546da 100644
--- a/core/fdrm/fx_crypt_aes.cpp
+++ b/core/fdrm/fx_crypt_aes.cpp
@@ -437,7 +437,7 @@
   (block[0] ^= *keysched++, block[1] ^= *keysched++, block[2] ^= *keysched++, \
    block[3] ^= *keysched++)
 #define MOVEWORD(i) (block[i] = newstate[i])
-#define MAKEWORD(i)                                         \
+#define FMAKEWORD(i)                                        \
   (newstate[i] = (E0[(block[i] >> 24) & 0xFF] ^             \
                   E1[(block[(i + C1) % Nb] >> 16) & 0xFF] ^ \
                   E2[(block[(i + C2) % Nb] >> 8) & 0xFF] ^  \
@@ -458,10 +458,10 @@
   unsigned int newstate[4];
   for (i = 0; i < ctx->Nr - 1; i++) {
     ADD_ROUND_KEY_4();
-    MAKEWORD(0);
-    MAKEWORD(1);
-    MAKEWORD(2);
-    MAKEWORD(3);
+    FMAKEWORD(0);
+    FMAKEWORD(1);
+    FMAKEWORD(2);
+    FMAKEWORD(3);
     MOVEWORD(0);
     MOVEWORD(1);
     MOVEWORD(2);
@@ -478,10 +478,10 @@
   MOVEWORD(3);
   ADD_ROUND_KEY_4();
 }
-#undef MAKEWORD
+#undef FMAKEWORD
 #undef LASTWORD
 
-#define MAKEWORD(i)                                         \
+#define FMAKEWORD(i)                                        \
   (newstate[i] = (D0[(block[i] >> 24) & 0xFF] ^             \
                   D1[(block[(i + C1) % Nb] >> 16) & 0xFF] ^ \
                   D2[(block[(i + C2) % Nb] >> 8) & 0xFF] ^  \
@@ -502,10 +502,10 @@
   unsigned int newstate[4];
   for (i = 0; i < ctx->Nr - 1; i++) {
     ADD_ROUND_KEY_4();
-    MAKEWORD(0);
-    MAKEWORD(1);
-    MAKEWORD(2);
-    MAKEWORD(3);
+    FMAKEWORD(0);
+    FMAKEWORD(1);
+    FMAKEWORD(2);
+    FMAKEWORD(3);
     MOVEWORD(0);
     MOVEWORD(1);
     MOVEWORD(2);
@@ -522,7 +522,7 @@
   MOVEWORD(3);
   ADD_ROUND_KEY_4();
 }
-#undef MAKEWORD
+#undef FMAKEWORD
 #undef LASTWORD
 
 void aes_setup(CRYPT_aes_context* ctx, const unsigned char* key, int keylen) {