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

Unified Diff: mojo/public/c/system/thunks.cc

Issue 2044023004: Mojo: Eliminate duplicate C API symbols (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 4 years, 6 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 | « mojo/public/c/system/thunks.h ('k') | mojo/public/mojo_application.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/c/system/thunks.cc
diff --git a/mojo/public/platform/native/system_thunks.cc b/mojo/public/c/system/thunks.cc
similarity index 98%
rename from mojo/public/platform/native/system_thunks.cc
rename to mojo/public/c/system/thunks.cc
index 86447c1cdebf2fe3c9fe19d9a5c62860edf19e80..fe2793b7c5a1a75ac58298563e606233e4e2377d 100644
--- a/mojo/public/platform/native/system_thunks.cc
+++ b/mojo/public/c/system/thunks.cc
@@ -2,14 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/public/platform/native/system_thunks.h"
+#include "mojo/public/c/system/thunks.h"
#include <assert.h>
#include <stddef.h>
#include <stdint.h>
-#include "mojo/public/platform/native/thunk_export.h"
-
extern "C" {
static MojoSystemThunks g_thunks = {0};
@@ -277,11 +275,10 @@ MojoResult MojoUnwrapPlatformSharedBufferHandle(
num_bytes, flags);
}
-extern "C" THUNK_EXPORT size_t MojoSetSystemThunks(
- const MojoSystemThunks* system_thunks) {
+} // extern "C"
+
+size_t MojoEmbedderSetSystemThunks(const MojoSystemThunks* system_thunks) {
if (system_thunks->size >= sizeof(g_thunks))
g_thunks = *system_thunks;
return sizeof(g_thunks);
}
-
-} // extern "C"
« no previous file with comments | « mojo/public/c/system/thunks.h ('k') | mojo/public/mojo_application.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698