ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-12 07:23:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master' into r0.5

Browse Source
This commit is contained in:
Joel Dice 2010-12-20 13:30:37 -07:00
commit dd29c94715
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readme.txt
View File

@ -62,7 +62,7 @@ Building
Build requirements include:
* GNU make 3.80 or later
* GCC 3.4 or later (4.5 or later for Windows/x86_64)
* GCC 3.4 or later (4.5.1 or later for Windows/x86_64)
* JDK 1.5 or later
* MinGW 3.4 or later (only if compiling for Windows)
* zlib 1.2.3 or later

4
src/boot.cpp
View File

@ -32,7 +32,7 @@ extern "C" void __cxa_pure_virtual(void) { abort(); }
#ifdef BOOT_IMAGE
#if (defined __MINGW32__) || (defined _MSC_VER)
#if (! defined __x86_64__) && ((defined __MINGW32__) || (defined _MSC_VER))
# define SYMBOL(x) binary_bootimage_bin_##x
#else
# define SYMBOL(x) _binary_bootimage_bin_##x
@ -58,7 +58,7 @@ extern "C" {
#ifdef BOOT_CLASSPATH
#if (defined __MINGW32__) || (defined _MSC_VER)
#if (! defined __x86_64__) && ((defined __MINGW32__) || (defined _MSC_VER))
# define SYMBOL(x) binary_classpath_jar_##x
#else
# define SYMBOL(x) _binary_classpath_jar_##x

3
src/compile-x86.S
View File

@ -12,7 +12,8 @@
#define LOCAL(x) .L##x
#if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
#if defined __APPLE__ \
|| ((defined __MINGW32__ || defined __CYGWIN32__) && ! defined __x86_64__)
# define GLOBAL(x) _##x
#else
# define GLOBAL(x) x

3
src/x86.S
View File

@ -12,7 +12,8 @@
#define LOCAL(x) .L##x
#if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
#if defined __APPLE__ \
|| ((defined __MINGW32__ || defined __CYGWIN32__) && ! defined __x86_64__)
# define GLOBAL(x) _##x
#else
# define GLOBAL(x) x