mirror of
https://github.com/corda/corda.git
synced 2025-01-07 13:38:47 +00:00
revert all __attribute__ ((externally_visible)) changes because it's not clear yet how to detect whether it's supported
This commit is contained in:
parent
f57d80f1b7
commit
1fd00dd55d
@ -20,21 +20,11 @@
|
|||||||
#if (defined __MINGW32__) || (defined _MSC_VER)
|
#if (defined __MINGW32__) || (defined _MSC_VER)
|
||||||
# define PLATFORM_WINDOWS
|
# define PLATFORM_WINDOWS
|
||||||
# define PATH_SEPARATOR ';'
|
# define PATH_SEPARATOR ';'
|
||||||
# ifdef __MINGW32__
|
# define JNIEXPORT __declspec(dllexport)
|
||||||
# define JNIEXPORT __declspec(dllexport) \
|
|
||||||
__attribute__ ((externally_visible))
|
|
||||||
# else // not __MINGW32__
|
|
||||||
# define JNIEXPORT __declspec(dllexport)
|
|
||||||
# endif // not __MINGW32__
|
|
||||||
#else // not (defined __MINGW32__) || (defined _MSC_VER)
|
#else // not (defined __MINGW32__) || (defined _MSC_VER)
|
||||||
# define PLATFORM_POSIX
|
# define PLATFORM_POSIX
|
||||||
# define PATH_SEPARATOR ':'
|
# define PATH_SEPARATOR ':'
|
||||||
# ifdef __APPLE__
|
# define JNIEXPORT __attribute__ ((visibility("default")))
|
||||||
# define JNIEXPORT __attribute__ ((visibility("default")))
|
|
||||||
# else // not __APPLE__
|
|
||||||
# define JNIEXPORT __attribute__ ((visibility("default"))) \
|
|
||||||
__attribute__ ((externally_visible))
|
|
||||||
# endif // not __APPLE__
|
|
||||||
#endif // not (defined __MINGW32__) || (defined _MSC_VER)
|
#endif // not (defined __MINGW32__) || (defined _MSC_VER)
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
17
src/boot.cpp
17
src/boot.cpp
@ -25,19 +25,10 @@ extern "C" void __cxa_pure_virtual(void) { abort(); }
|
|||||||
#endif // not _MSC_VER
|
#endif // not _MSC_VER
|
||||||
|
|
||||||
#if (defined __MINGW32__) || (defined _MSC_VER)
|
#if (defined __MINGW32__) || (defined _MSC_VER)
|
||||||
# ifdef __MINGW32__
|
# define EXPORT __declspec(dllexport)
|
||||||
# define EXPORT __declspec(dllexport) __attribute__ ((externally_visible))
|
#else
|
||||||
# else // not __MINGW32__
|
# define EXPORT __attribute__ ((visibility("default")))
|
||||||
# define EXPORT __declspec(dllexport)
|
#endif
|
||||||
# endif // not __MINGW32__
|
|
||||||
#else // not (defined __MINGW32__) || (defined _MSC_VER)
|
|
||||||
# ifdef __APPLE__
|
|
||||||
# define EXPORT __attribute__ ((visibility("default")))
|
|
||||||
# else // not __APPLE__
|
|
||||||
# define EXPORT __attribute__ ((visibility("default"))) \
|
|
||||||
__attribute__ ((externally_visible))
|
|
||||||
# endif // not __APPLE__
|
|
||||||
#endif // not (defined __MINGW32__) || (defined _MSC_VER)
|
|
||||||
|
|
||||||
#ifdef BOOT_IMAGE
|
#ifdef BOOT_IMAGE
|
||||||
|
|
||||||
|
@ -90,15 +90,10 @@ typedef uint64_t uintptr_t;
|
|||||||
|
|
||||||
#undef JNIEXPORT
|
#undef JNIEXPORT
|
||||||
#ifdef PLATFORM_WINDOWS
|
#ifdef PLATFORM_WINDOWS
|
||||||
# define JNIEXPORT __declspec(dllexport) __attribute__ ((externally_visible))
|
# define JNIEXPORT __declspec(dllexport)
|
||||||
# define PATH_SEPARATOR ';'
|
# define PATH_SEPARATOR ';'
|
||||||
#else // not PLATFORM_WINDOWS
|
#else // not PLATFORM_WINDOWS
|
||||||
# ifdef __APPLE__
|
# define JNIEXPORT __attribute__ ((visibility("default")))
|
||||||
# define JNIEXPORT __attribute__ ((visibility("default")))
|
|
||||||
# else // not __APPLE__
|
|
||||||
# define JNIEXPORT __attribute__ ((visibility("default"))) \
|
|
||||||
__attribute__ ((externally_visible))
|
|
||||||
# endif // not __APPLE__
|
|
||||||
# define PATH_SEPARATOR ':'
|
# define PATH_SEPARATOR ':'
|
||||||
#endif // not PLATFORM_WINDOWS
|
#endif // not PLATFORM_WINDOWS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user