From 2b6d5d5d7e67305f41c232006434dc008c79bf2e Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Tue, 24 Apr 2018 00:31:53 +0900
Subject: [PATCH] Bug 1442275 - Implement a path charset agnostic wrapper for
 PR_LoadLibraryWithFlags. r=froydnj

MozReview-Commit-ID: 5rjmcv4kz9x

--HG--
extra : rebase_source : b57c7e79ceaa2dc3d65f52ee8f665c640dd1f41c
---
 mfbt/SharedLibrary.h | 47 ++++++++++++++++++++++++++++++++++++++++++++
 mfbt/moz.build       |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 mfbt/SharedLibrary.h

diff --git a/mfbt/SharedLibrary.h b/mfbt/SharedLibrary.h
new file mode 100644
index 000000000000..cdf31b66f035
--- /dev/null
+++ b/mfbt/SharedLibrary.h
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Path charset agnostic wrappers for prlink.h. */
+
+#ifndef mozilla_SharedLibrary_h
+#define mozilla_SharedLibrary_h
+
+#ifdef MOZILLA_INTERNAL_API
+
+#include "prlink.h"
+#include "mozilla/Char16.h"
+
+namespace mozilla {
+
+//
+// Load the specified library.
+//
+// @param aPath  path to the library
+// @param aFlags takes PR_LD_* flags (see prlink.h)
+//
+inline PRLibrary*
+#ifdef XP_WIN
+LoadLibraryWithFlags(char16ptr_t aPath, PRUint32 aFlags = 0)
+#else
+LoadLibraryWithFlags(const char* aPath, PRUint32 aFlags = 0)
+#endif
+{
+  PRLibSpec libSpec;
+#ifdef XP_WIN
+  libSpec.type = PR_LibSpec_PathnameU;
+  libSpec.value.pathname_u = aPath;
+#else
+  libSpec.type = PR_LibSpec_Pathname;
+  libSpec.value.pathname = aPath;
+#endif
+  return PR_LoadLibraryWithFlags(libSpec, aFlags);
+}
+
+}  /* namespace mozilla */
+
+#endif /* MOZILLA_INTERNAL_API */
+
+#endif /* mozilla_SharedLibrary_h */
diff --git a/mfbt/moz.build b/mfbt/moz.build
index 527637b28845..c8ca7b97037d 100644
--- a/mfbt/moz.build
+++ b/mfbt/moz.build
@@ -82,6 +82,7 @@ EXPORTS.mozilla = [
     'ScopeExit.h',
     'SegmentedVector.h',
     'SHA1.h',
+    'SharedLibrary.h',
     'SmallPointerArray.h',
     'Span.h',
     'SplayTree.h',