I'm committing the attached patch which adds regeneration of gnu.java.net.LocalSocketImpl.h to the include Makefile.am and also fixes a header I wrongly changed a few weeks back.
Changelog:
2006-05-03 Andrew John Hughes <[EMAIL PROTECTED]>
* include/Makefile.am:
Added rules for gnu.java.net.local.LocalSocketImpl.h
* include/java_lang_VMSystem.h:
Regenerated correctly.
--
Andrew :-)
Please avoid sending me Microsoft Office (e.g. Word, PowerPoint) attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html
If you use Microsoft Office, support movement towards the end of vendor lock-in:
http://opendocumentfellowship.org/petition/
"Value your freedom, or you will lose it, teaches history.
`Don't bother us with politics' respond those who don't want to learn."
-- Richard Stallman
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.55
diff -u -3 -p -u -r1.55 Makefile.am
--- include/Makefile.am 19 Mar 2006 23:17:16 -0000 1.55
+++ include/Makefile.am 3 May 2006 20:19:20 -0000
@@ -119,6 +119,7 @@ $(GTKPEER_H_FILES) \
$(QTPEER_H_FILES) \
$(top_srcdir)/include/gnu_java_net_VMPlainDatagramSocketImpl.h \
$(top_srcdir)/include/gnu_java_net_VMPlainSocketImpl.h \
+$(top_srcdir)/include/gnu_java_net_local_LocalSocketImpl.h \
$(top_srcdir)/include/gnu_java_nio_VMPipe.h \
$(top_srcdir)/include/gnu_java_nio_VMSelector.h \
$(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h \
@@ -168,6 +169,8 @@ $(top_srcdir)/include/gnu_java_net_VMPla
$(JAVAH) -o $@ gnu.java.net.VMPlainDatagramSocketImpl
$(top_srcdir)/include/gnu_java_net_VMPlainSocketImpl.h:
$(top_srcdir)/vm/reference/gnu/java/net/VMPlainSocketImpl.java
$(JAVAH) -o $@ gnu.java.net.VMPlainSocketImpl
+$(top_srcdir)/include/gnu_java_net_local_LocalSocketImpl.h:
$(top_srcdir)/gnu/java/net/local/LocalSocketImpl.java
+ $(JAVAH) -o $@ gnu.java.net.local.LocalSocketImpl
$(top_srcdir)/include/gnu_java_nio_VMPipe.h:
$(top_srcdir)/vm/reference/gnu/java/nio/VMPipe.java
$(JAVAH) -o $@ gnu.java.nio.VMPipe
$(top_srcdir)/include/gnu_java_nio_VMSelector.h:
$(top_srcdir)/vm/reference/gnu/java/nio/VMSelector.java
Index: include/java_lang_VMSystem.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_lang_VMSystem.h,v
retrieving revision 1.7
diff -u -3 -p -u -r1.7 java_lang_VMSystem.h
--- include/java_lang_VMSystem.h 22 Apr 2006 21:52:18 -0000 1.7
+++ include/java_lang_VMSystem.h 3 May 2006 20:19:20 -0000
@@ -1,24 +1,26 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-#ifndef _Included_java_lang_VMSystem
-#define _Included_java_lang_VMSystem
+#ifndef __java_lang_VMSystem__
+#define __java_lang_VMSystem__
+
+#include <jni.h>
#ifdef __cplusplus
-extern "C" {
+extern "C"
+{
#endif
-JNIEXPORT void JNICALL Java_java_lang_VMSystem_arraycopy(JNIEnv*, jclass,
jobject, jint, jobject, jint, jint);
-JNIEXPORT jint JNICALL Java_java_lang_VMSystem_identityHashCode(JNIEnv*,
jclass, jobject);
-JNIEXPORT void JNICALL Java_java_lang_VMSystem_setIn(JNIEnv*, jclass, jobject);
-JNIEXPORT void JNICALL Java_java_lang_VMSystem_setOut(JNIEnv*, jclass,
jobject);
-JNIEXPORT void JNICALL Java_java_lang_VMSystem_setErr(JNIEnv*, jclass,
jobject);
-JNIEXPORT jlong JNICALL Java_java_lang_VMSystem_currentTimeMillis(JNIEnv*,
jclass);
-JNIEXPORT jobject JNICALL Java_java_lang_VMSystem_environ(JNIEnv*, jclass);
-JNIEXPORT jstring JNICALL Java_java_lang_VMSystem_getenv(JNIEnv*, jclass,
jstring);
+JNIEXPORT void JNICALL Java_java_lang_VMSystem_arraycopy (JNIEnv *env, jclass,
jobject, jint, jobject, jint, jint);
+JNIEXPORT jint JNICALL Java_java_lang_VMSystem_identityHashCode (JNIEnv *env,
jclass, jobject);
+JNIEXPORT void JNICALL Java_java_lang_VMSystem_setIn (JNIEnv *env, jclass,
jobject);
+JNIEXPORT void JNICALL Java_java_lang_VMSystem_setOut (JNIEnv *env, jclass,
jobject);
+JNIEXPORT void JNICALL Java_java_lang_VMSystem_setErr (JNIEnv *env, jclass,
jobject);
+JNIEXPORT jlong JNICALL Java_java_lang_VMSystem_currentTimeMillis (JNIEnv
*env, jclass);
+JNIEXPORT jobject JNICALL Java_java_lang_VMSystem_environ (JNIEnv *env,
jclass);
+JNIEXPORT jstring JNICALL Java_java_lang_VMSystem_getenv (JNIEnv *env, jclass,
jstring);
#ifdef __cplusplus
}
#endif
-#endif
+#endif /* __java_lang_VMSystem__ */
signature.asc
Description: Digital signature
