mirror of
https://github.com/corda/corda.git
synced 2025-01-07 13:38:47 +00:00
ammend recent commit to avoid using __attribute__ ((externally_visible)) when it is not available (second try)
This commit is contained in:
parent
51fcf1ef74
commit
f57d80f1b7
14
src/boot.cpp
14
src/boot.cpp
@ -24,15 +24,12 @@ extern "C" void __cxa_pure_virtual(void) { abort(); }
|
||||
|
||||
#endif // not _MSC_VER
|
||||
|
||||
#ifdef BOOT_IMAGE
|
||||
|
||||
#if (defined __MINGW32__) || (defined _MSC_VER)
|
||||
# ifdef __MINGW32__
|
||||
# define EXPORT __declspec(dllexport) __attribute__ ((externally_visible))
|
||||
# else // not __MINGW32__
|
||||
# define EXPORT __declspec(dllexport)
|
||||
# endif // not __MINGW32__
|
||||
# define SYMBOL(x) binary_bootimage_bin_##x
|
||||
#else // not (defined __MINGW32__) || (defined _MSC_VER)
|
||||
# ifdef __APPLE__
|
||||
# define EXPORT __attribute__ ((visibility("default")))
|
||||
@ -40,9 +37,16 @@ extern "C" void __cxa_pure_virtual(void) { abort(); }
|
||||
# define EXPORT __attribute__ ((visibility("default"))) \
|
||||
__attribute__ ((externally_visible))
|
||||
# endif // not __APPLE__
|
||||
# define SYMBOL(x) _binary_bootimage_bin_##x
|
||||
#endif // not (defined __MINGW32__) || (defined _MSC_VER)
|
||||
|
||||
#ifdef BOOT_IMAGE
|
||||
|
||||
#if (defined __MINGW32__) || (defined _MSC_VER)
|
||||
# define SYMBOL(x) binary_bootimage_bin_##x
|
||||
#else
|
||||
# define SYMBOL(x) _binary_bootimage_bin_##x
|
||||
#endif
|
||||
|
||||
extern "C" {
|
||||
|
||||
extern const uint8_t SYMBOL(start)[];
|
||||
@ -62,10 +66,8 @@ extern "C" {
|
||||
#ifdef BOOT_CLASSPATH
|
||||
|
||||
#if (defined __MINGW32__) || (defined _MSC_VER)
|
||||
# define EXPORT __declspec(dllexport) __attribute__ ((externally_visible))
|
||||
# define SYMBOL(x) binary_classpath_jar_##x
|
||||
#else
|
||||
# define EXPORT __attribute__ ((visibility("default"))) __attribute__ ((externally_visible))
|
||||
# define SYMBOL(x) _binary_classpath_jar_##x
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user