From d4c39e07a20aaf7e8ca35682cdf28226c84ea39b Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Tue, 1 Feb 2011 08:48:30 -0700 Subject: [PATCH] update readme.txt to reflect that 64-bit Windows does not use an underscore prefix for symbols --- readme.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/readme.txt b/readme.txt index 0f0ad44bb7..8e88b4abb4 100644 --- a/readme.txt +++ b/readme.txt @@ -316,11 +316,15 @@ setting the boot classpath to "[bootJar]". #include "stdint.h" #include "jni.h" -#ifdef __MINGW32__ +#if (defined __MINGW32__) || (defined _MSC_VER) # define EXPORT __declspec(dllexport) -# define SYMBOL(x) binary_boot_jar_##x #else # define EXPORT __attribute__ ((visibility("default"))) +#endif + +#if (! defined __x86_64__) && ((defined __MINGW32__) || (defined _MSC_VER)) +# define SYMBOL(x) binary_boot_jar_##x +#else # define SYMBOL(x) _binary_boot_jar_##x #endif @@ -520,11 +524,15 @@ containing them. See the previous example for instructions. #include "stdint.h" #include "jni.h" -#ifdef __MINGW32__ +#if (defined __MINGW32__) || (defined _MSC_VER) # define EXPORT __declspec(dllexport) -# define BOOTIMAGE_BIN(x) binary_bootimage_bin_##x #else # define EXPORT __attribute__ ((visibility("default"))) +#endif + +#if (! defined __x86_64__) && ((defined __MINGW32__) || (defined _MSC_VER)) +# define BOOTIMAGE_BIN(x) binary_bootimage_bin_##x +#else # define BOOTIMAGE_BIN(x) _binary_bootimage_bin_##x #endif