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

Merge branch 'oss-master' into dev

Browse Source
This commit is contained in:
Joel Dice 2011-02-08 19:08:41 -07:00
commit 8fdd547922
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classpath/java/io/BufferedInputStream.java
View File

@ -66,6 +66,7 @@ public class BufferedInputStream extends InputStream {
} }
break; break;
} else { } else {
offset += c;
count += c; count += c;
length -= c; length -= c;

2
makefile
View File

@ -203,7 +203,7 @@ endif
ifeq ($(arch),arm) ifeq ($(arch),arm)
asm = arm asm = arm
pointer-size = 4 pointer-size = 4
cflags += -Wno-psabi cflags += -marm -Wno-psabi
ifneq ($(arch),$(build-arch)) ifneq ($(arch),$(build-arch))
cxx = arm-linux-gnueabi-g++ cxx = arm-linux-gnueabi-g++