From 0be7b2bcef865fce63698c9aa819ed1e7ea8335a Mon Sep 17 00:00:00 2001 From: "dpranke@chromium.org" Date: Thu, 13 Oct 2011 01:50:30 +0000 Subject: Link startup_helper_win statically to force InitializeSandboxInfo to use the sandbox library linked statically into an executable; using a sandbox library linked into content.dll doesn't work on windows. R=jam@chromium.org BUG=90442 TEST= Review URL: http://codereview.chromium.org/8233039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105238 0039d316-1c4b-4281-b951-d872f2087c98 --- content/app/startup_helper_win.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'content/app') diff --git a/content/app/startup_helper_win.h b/content/app/startup_helper_win.h index b870798..e20b638 100644 --- a/content/app/startup_helper_win.h +++ b/content/app/startup_helper_win.h @@ -6,8 +6,6 @@ #define CONTENT_APP_STARTUP_HELPER_WIN_H_ #pragma once -#include "content/common/content_export.h" - class CommandLine; namespace sandbox { @@ -18,9 +16,11 @@ struct SandboxInterfaceInfo; // will want to call at startup. namespace content { -// Initializes the sandbox code and turns on DEP. -CONTENT_EXPORT void InitializeSandboxInfo( - sandbox::SandboxInterfaceInfo* sandbox_info); +// Initializes the sandbox code and turns on DEP. Note: This function +// must be *statically* linked into the executable (along with the static +// sandbox library); it will not work correctly if it is exported from a +// DLL and linked in. +void InitializeSandboxInfo(sandbox::SandboxInterfaceInfo* sandbox_info); // Register the invalid param handler and pure call handler to be able to // notify breakpad when it happens. -- cgit v1.1