Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2595)

Unified Diff: sandbox/sandbox_export.h

Issue 273423007: Move sanbox_export.h to //sandbox from //sandbox/linux and split root OWNERS file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Drop OWNERS Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/linux/suid/client/setuid_sandbox_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/sandbox_export.h
diff --git a/sandbox/linux/sandbox_export.h b/sandbox/sandbox_export.h
similarity index 62%
rename from sandbox/linux/sandbox_export.h
rename to sandbox/sandbox_export.h
index 546de908edac9d59b7f3b185b7a2b3354eb712cc..0b773034ba4a3f46fa3749d1fcf79ae3b5b00169 100644
--- a/sandbox/linux/sandbox_export.h
+++ b/sandbox/sandbox_export.h
@@ -2,10 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SANDBOX_LINUX_SANDBOX_EXPORT_H_
-#define SANDBOX_LINUX_SANDBOX_EXPORT_H_
+#ifndef SANDBOX_SANDBOX_EXPORT_H_
+#define SANDBOX_SANDBOX_EXPORT_H_
#if defined(COMPONENT_BUILD)
+#if defined(WIN32)
rvargas (doing something else) 2014/05/12 21:56:35 I don't think we should have this part. At the ver
Robert Sesek 2014/05/12 22:09:48 It seemed wrong to move it to the parent directory
rvargas (doing something else) 2014/05/12 22:49:57 Now I'm confused. Are you saying that this file sh
Robert Sesek 2014/05/12 23:29:42 No, it's needed by Mac and Linux. It didn't seem s
+
+#if defined(SANDBOX_IMPLEMENTATION)
+#define SANDBOX_EXPORT __declspec(dllexport)
+#else
+#define SANDBOX_EXPORT __declspec(dllimport)
+#endif // defined(GFX_IMPLEMENTATION)
+
+#else // defined(WIN32)
#if defined(SANDBOX_IMPLEMENTATION)
#define SANDBOX_EXPORT __attribute__((visibility("default")))
@@ -15,9 +24,12 @@
#define SANDBOX_EXPORT_PRIVATE
#endif // defined(SANDBOX_IMPLEMENTATION)
+#endif // defined(WIN32)
#else // defined(COMPONENT_BUILD)
+
#define SANDBOX_EXPORT
#define SANDBOX_EXPORT_PRIVATE
+
#endif // defined(COMPONENT_BUILD)
-#endif // SANDBOX_LINUX_SANDBOX_EXPORT_H_
+#endif // SANDBOX_SANDBOX_EXPORT_H_
« no previous file with comments | « sandbox/linux/suid/client/setuid_sandbox_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698