| 1 | --- classpath-0.98-original/native/jni/java-net/java_net_VMNetworkInterface.c 2011-02-26 16:07:22.805044224 +0000 |
|---|
| 2 | +++ classpath-0.98/native/jni/java-net/java_net_VMNetworkInterface.c 2011-02-26 16:08:11.500957184 +0000 |
|---|
| 3 | @@ -315,7 +315,7 @@ |
|---|
| 4 | } |
|---|
| 5 | else |
|---|
| 6 | { |
|---|
| 7 | - retval = (flags & (IFF_UP | IFF_RUNNING)) |
|---|
| 8 | + retval = (flags & (IFF_UP)) |
|---|
| 9 | ? JNI_TRUE |
|---|
| 10 | : JNI_FALSE; |
|---|
| 11 | } |
|---|
| 12 | --- classpath-0.98-original/tools/Makefile.in 2011-02-27 22:49:54.395313152 +0000 |
|---|
| 13 | +++ classpath-0.98/tools/Makefile.in 2011-02-27 22:50:17.481820672 +0000 |
|---|
| 14 | @@ -422,7 +422,7 @@ |
|---|
| 15 | @CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@gjdoc_gendir = ${top_builddir}/tools/generated |
|---|
| 16 | @CREATE_GJDOC_TRUE@ANTLR_CLASSPATH = $(ANTLR_JAR):$(gjdoc_gendir) |
|---|
| 17 | GLIBJ_BOOTCLASSPATH = '$(top_builddir)/lib/glibj.zip:$(top_builddir)/lib' |
|---|
| 18 | -GLIBJ_CLASSPATH = asm:$(ANTLR_CLASSPATH) |
|---|
| 19 | +GLIBJ_CLASSPATH = /boot/common/share/classpath/tools.zip:$(ANTLR_CLASSPATH) |
|---|
| 20 | @GCJ_JAVAC_FALSE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH) |
|---|
| 21 | |
|---|
| 22 | # Setup the compiler to use the GNU Classpath library we just built. |
|---|
| 23 | --- classpath-0.98-original/native/jni/java-nio/Makefile.in 2011-03-01 22:29:33.298319872 +0000 |
|---|
| 24 | +++ classpath-0.98/native/jni/java-nio/Makefile.in 2011-03-01 22:30:17.983826432 +0000 |
|---|
| 25 | @@ -310,7 +310,7 @@ |
|---|
| 26 | |
|---|
| 27 | libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \ |
|---|
| 28 | $(top_builddir)/native/jni/native-lib/libclasspathnative.la \ |
|---|
| 29 | - $(LTLIBICONV) |
|---|
| 30 | + -Wl,$(LIBICONV) |
|---|
| 31 | |
|---|
| 32 | |
|---|
| 33 | # Directly included through javanio.h |
|---|
