summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-08-19 13:18:41 +0900
committerGitHub <[email protected]>2019-08-19 13:18:41 +0900
commit1961059330a47ea6030e2247b2bb2d9eea428205 (patch)
tree68d5fe9a005430d74a8951fb218d48c8c645703e
parent3fbd5f0029c24d43870a44b342ab9600d7c1fcca (diff)
parentb5662c87c8217d7a0262fa1808450ab1752ff1b4 (diff)
downloadmruby-1961059330a47ea6030e2247b2bb2d9eea428205.tar.gz
mruby-1961059330a47ea6030e2247b2bb2d9eea428205.zip
Merge pull request #4643 from lopopolo/externally-define-MRB_API
Allow external definition of MRB_API macro
-rw-r--r--include/mruby/common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mruby/common.h b/include/mruby/common.h
index 45ab71ef5..5be9a40c6 100644
--- a/include/mruby/common.h
+++ b/include/mruby/common.h
@@ -62,6 +62,7 @@ MRB_BEGIN_DECL
#define MRB_INLINE static inline
/** Declare a public MRuby API function. */
+#ifndef MRB_API
#if defined(MRB_BUILD_AS_DLL)
#if defined(MRB_CORE) || defined(MRB_LIB)
# define MRB_API __declspec(dllexport)
@@ -71,6 +72,7 @@ MRB_BEGIN_DECL
#else
# define MRB_API extern
#endif
+#endif
MRB_END_DECL