Skip to content

Commit

Permalink
refs #13054 correctly handle {.exportc,dynlib.} and {.exportcpp,dynli…
Browse files Browse the repository at this point in the history
…b.} (#13136)

* refs #13054 correctly handle {.exportc,dynlib.} and {.exportcpp,dynlib.}
* put back NIM_EXTERNC for N_LIB_EXPORT; causes issues with compilerproc
  • Loading branch information
timotheecour authored and Araq committed Jan 18, 2020
1 parent 107352f commit c56612f
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions lib/nimbase.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,13 @@ __AVR__
# define NIM_CAST(type, ptr) ((type)(ptr))
#endif


/* ------------------------------------------------------------------- */
#ifdef __cplusplus
# define NIM_EXTERNC extern "C"
#else
# define NIM_EXTERNC
#endif

#if defined(WIN32) || defined(_WIN32) /* only Windows has this mess... */
# define N_LIB_PRIVATE
Expand Down Expand Up @@ -208,11 +214,7 @@ __AVR__
# define N_FASTCALL_PTR(rettype, name) rettype (*name)
# define N_SAFECALL_PTR(rettype, name) rettype (*name)
# endif
# ifdef __cplusplus
# define N_LIB_EXPORT extern "C"
# else
# define N_LIB_EXPORT extern
# endif
# define N_LIB_EXPORT NIM_EXTERNC __attribute__((visibility("default")))
# define N_LIB_IMPORT extern
#endif

Expand Down Expand Up @@ -520,12 +522,6 @@ typedef int Nim_and_C_compiler_disagree_on_target_architecture[sizeof(NI) == siz
}
#endif

#ifdef __cplusplus
# define NIM_EXTERNC extern "C"
#else
# define NIM_EXTERNC
#endif

#if defined(_MSC_VER)
# define NIM_ALIGN(x) __declspec(align(x))
#else
Expand Down

0 comments on commit c56612f

Please sign in to comment.