Resolve macro redefinition warnings when built in Chromium

third_party/third_party.gyp

Index: third_party/third_party.gyp
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index 7fd108245447ca02a871a002baaef9a16ebc0e6c..840c16635d2e37f42ab21fed70b3f6df0edbf39d 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -12,7 +12,6 @@
       'OPJ_STATIC',
       'PNG_PREFIX',
       'PNG_USE_READ_MACROS',
-      '_CRT_SECURE_NO_WARNINGS',
     ],
     'include_dirs': [
       # This is implicit in GN.
@@ -20,7 +19,7 @@
       '..',
     ],
     'msvs_disabled_warnings': [
-      4005, 4018, 4146, 4333, 4345, 4267
+      4018, 4146, 4333, 4345, 4267
     ],
   },
   'targets': [
@@ -411,6 +410,15 @@
             'libtiff/tif_write.c',
             'libtiff/tif_zip.c',
           ],
+          'conditions': [
+            ['OS=="win"', {
+              'defines!': [
+                 # Need to undefine the macro since it is redefined in
+                 # tif_ojpeg.c and tif_jpeg.c.
+                'WIN32_LEAN_AND_MEAN',
+              ],
+            }],
+          ],
         },
       ],
     }],