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

Side by Side Diff: runtime/bin/extensions.h

Issue 2695403003: Undo rename of LoadExtensionLibrary to LoadLibrary since mangling on Windows seems to create a conf… (Closed)
Patch Set: comment Created 3 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | runtime/bin/extensions.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #ifndef RUNTIME_BIN_EXTENSIONS_H_ 5 #ifndef RUNTIME_BIN_EXTENSIONS_H_
6 #define RUNTIME_BIN_EXTENSIONS_H_ 6 #define RUNTIME_BIN_EXTENSIONS_H_
7 7
8 #include "include/dart_api.h" 8 #include "include/dart_api.h"
9 #include "platform/globals.h" 9 #include "platform/globals.h"
10 10
11 namespace dart { 11 namespace dart {
12 namespace bin { 12 namespace bin {
13 13
14 class Extensions { 14 class Extensions {
15 public: 15 public:
16 // TODO(whesse): Make extension load from a relative path relative to 16 // TODO(whesse): Make extension load from a relative path relative to
17 // the library it is in. Currently loads from current working directory. 17 // the library it is in. Currently loads from current working directory.
18 static Dart_Handle LoadExtension(const char* extension_directory, 18 static Dart_Handle LoadExtension(const char* extension_directory,
19 const char* extension_name, 19 const char* extension_name,
20 Dart_Handle parent_library); 20 Dart_Handle parent_library);
21 21
22 // Platform-specific implementations. 22 // Platform-specific implementations.
23 static void* LoadLibrary(const char* library_file); 23 // Don't rename LoadExtensionLibrary to LoadLibrary since on Windows it
24 // conflicts with LoadLibraryW after mangling.
25 static void* LoadExtensionLibrary(const char* library_file);
24 static void* ResolveSymbol(void* lib_handle, const char* symbol); 26 static void* ResolveSymbol(void* lib_handle, const char* symbol);
25 static void UnloadLibrary(void* lib_handle); 27 static void UnloadLibrary(void* lib_handle);
26 28
27 private: 29 private:
28 static Dart_Handle GetError(); 30 static Dart_Handle GetError();
29 31
30 static void* MakePathAndResolve(const char* dir, const char* name); 32 static void* MakePathAndResolve(const char* dir, const char* name);
31 static void* ResolveAbsPathExtension(const char* extension_path); 33 static void* ResolveAbsPathExtension(const char* extension_path);
32 static void* ResolveExtension(const char* extensioion_directory, 34 static void* ResolveExtension(const char* extensioion_directory,
33 const char* extension_name); 35 const char* extension_name);
34 36
35 // The returned string is scope allocated. 37 // The returned string is scope allocated.
36 static const char* Concatenate(const char** strings); 38 static const char* Concatenate(const char** strings);
37 39
38 DISALLOW_ALLOCATION(); 40 DISALLOW_ALLOCATION();
39 DISALLOW_IMPLICIT_CONSTRUCTORS(Extensions); 41 DISALLOW_IMPLICIT_CONSTRUCTORS(Extensions);
40 }; 42 };
41 43
42 } // namespace bin 44 } // namespace bin
43 } // namespace dart 45 } // namespace dart
44 46
45 #endif // RUNTIME_BIN_EXTENSIONS_H_ 47 #endif // RUNTIME_BIN_EXTENSIONS_H_
OLDNEW
« no previous file with comments | « no previous file | runtime/bin/extensions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698