[tor-commits] [tor-browser/tor-browser-52.3.0esr-7.5-2] We don't take the SANDBOX_EXPORTS path and fix compile issues along our way

[gk at torproject.org]

commit 0b5dfeae5d09168e020acd2f630c5352674075ab
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Sep 18 19:06:56 2017 +0000

    We don't take the SANDBOX_EXPORTS path and fix compile issues along our way
---
 security/sandbox/chromium/sandbox/win/src/interception.h | 4 ++--
 security/sandbox/moz.build                               | 2 +-
 security/sandbox/win/src/sandboxbroker/moz.build         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/security/sandbox/chromium/sandbox/win/src/interception.h b/security/sandbox/chromium/sandbox/win/src/interception.h
index 850e4eef54c6..ceff4b62d1a0 100644
--- a/security/sandbox/chromium/sandbox/win/src/interception.h
+++ b/security/sandbox/chromium/sandbox/win/src/interception.h
@@ -268,7 +268,7 @@ class InterceptionManager {
 #define ADD_NT_INTERCEPTION(service, id, num_params) \
   AddToPatchedFunctions(kNtdllName, #service, \
                         sandbox::INTERCEPTION_SERVICE_CALL, \
-                        MAKE_SERVICE_NAME(service), id)
+                        (void*)MAKE_SERVICE_NAME(service), id)
 
 #define INTERCEPT_NT(manager, service, id, num_params) \
   manager->ADD_NT_INTERCEPTION(service, id, num_params)
@@ -279,7 +279,7 @@ class InterceptionManager {
 // we are guaranteed that our IAT has been initialized.
 #define INTERCEPT_EAT(manager, dll, function, id, num_params) \
   manager->AddToPatchedFunctions(dll, #function, sandbox::INTERCEPTION_EAT, \
-                                 MAKE_SERVICE_NAME(function), id)
+                                 (void*)MAKE_SERVICE_NAME(function), id)
 #endif  // SANDBOX_EXPORTS
 
 }  // namespace sandbox
diff --git a/security/sandbox/moz.build b/security/sandbox/moz.build
index 1420d6498af9..7b9cb01e4e87 100644
--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@@ -154,7 +154,7 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
             'chromium/sandbox/win/src/Wow64.cc',
         ]
 
-    for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS',
+    for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM',
                 '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
         DEFINES[var] = True
 
diff --git a/security/sandbox/win/src/sandboxbroker/moz.build b/security/sandbox/win/src/sandboxbroker/moz.build
index 4a9d01cc5fa5..4df77d232f38 100644
--- a/security/sandbox/win/src/sandboxbroker/moz.build
+++ b/security/sandbox/win/src/sandboxbroker/moz.build
@@ -12,7 +12,7 @@ EXPORTS += [
     'sandboxBroker.h',
 ]
 
-for var in ('UNICODE', '_UNICODE', 'SANDBOX_EXPORTS'):
+for var in ('UNICODE', '_UNICODE'):
     DEFINES[var] = True
 
 LOCAL_INCLUDES += [