ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into wip

Browse Source
This commit is contained in:
Joel Dice 2009-10-27 09:35:13 -06:00
commit 8bf3487ff1
3 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classpath/jni-util.h
View File

@ -16,16 +16,26 @@
#include "string.h"
#undef JNIEXPORT
#if (defined __MINGW32__) || (defined _MSC_VER)
# define PLATFORM_WINDOWS
# define PATH_SEPARATOR ';'
# define JNIEXPORT __declspec(dllexport) __attribute__ ((externally_visible))
#else
# ifdef __MINGW32__
# define JNIEXPORT __declspec(dllexport) \
__attribute__ ((externally_visible))
# else // not __MINGW32__
# define JNIEXPORT __declspec(dllexport)
# endif // not __MINGW32__
#else // not (defined __MINGW32__) || (defined _MSC_VER)
# define PLATFORM_POSIX
# define PATH_SEPARATOR ':'
# define JNIEXPORT __attribute__ ((visibility("default"))) \
# ifdef __APPLE__
# define JNIEXPORT __attribute__ ((visibility("default")))
# else // not __APPLE__
# define JNIEXPORT __attribute__ ((visibility("default"))) \
__attribute__ ((externally_visible))
#endif
# endif // not __APPLE__
#endif // not (defined __MINGW32__) || (defined _MSC_VER)
#ifdef _MSC_VER

17
src/boot.cpp
View File

@ -27,12 +27,21 @@ extern "C" void __cxa_pure_virtual(void) { abort(); }
#ifdef BOOT_IMAGE
#if (defined __MINGW32__) || (defined _MSC_VER)
# define EXPORT __declspec(dllexport) __attribute__ ((externally_visible))
# 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
# define EXPORT __attribute__ ((visibility("default"))) __attribute__ ((externally_visible))
#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__
# define SYMBOL(x) _binary_bootimage_bin_##x
#endif
#endif // not (defined __MINGW32__) || (defined _MSC_VER)
extern "C" {

11
src/common.h
View File

@ -92,10 +92,15 @@ typedef uint64_t uintptr_t;
#ifdef PLATFORM_WINDOWS
# define JNIEXPORT __declspec(dllexport) __attribute__ ((externally_visible))
# define PATH_SEPARATOR ';'
#else
# define JNIEXPORT __attribute__ ((visibility("default"))) __attribute__ ((externally_visible))
#else // not PLATFORM_WINDOWS
# ifdef __APPLE__
# define JNIEXPORT __attribute__ ((visibility("default")))
# else // not __APPLE__
# define JNIEXPORT __attribute__ ((visibility("default"))) \
__attribute__ ((externally_visible))
# endif // not __APPLE__
# define PATH_SEPARATOR ':'
#endif
#endif // not PLATFORM_WINDOWS
#if (defined ARCH_x86_32) || (defined ARCH_powerpc) || (defined ARCH_arm)
# define LD "ld"