Commit 694e7dea authored by Georg Koppen's avatar Georg Koppen
Browse files

We don't take the SANDBOX_EXPORTS path and fix compile issues along our way

parent 7d38f1ef

security/sandbox/chromium/sandbox/win/src/interception.h

+2 −2
Original line number Diff line number Diff line
@@ -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

security/sandbox/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -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

security/sandbox/win/src/sandboxbroker/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ EXPORTS += [ 
    'sandboxBroker.h',

]



for var in ('UNICODE', '_UNICODE', 'SANDBOX_EXPORTS'):

for var in ('UNICODE', '_UNICODE'):

    DEFINES[var] = True



LOCAL_INCLUDES += [