summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2006-05-03 20:22:55 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2006-05-03 20:22:55 +0000
commit5e5120b9581682740ca67de265541a7773d70916 (patch)
tree3df9aa4705be191249c5fcf274d339a1f27a833c
parentec589bc27900b16dfbaedb4a5ee06a182a511b2b (diff)
downloadclasspath-5e5120b9581682740ca67de265541a7773d70916.tar.gz
2006-05-03 Andrew John Hughes <gnu_andrew@member.fsf.org>classpath-0_91-branch-point
* include/Makefile.am: Added rules for gnu.java.net.local.LocalSocketImpl.h * include/java_lang_VMSystem.h: Regenerated correctly.
-rw-r--r--ChangeLog7
-rw-r--r--include/Makefile.am3
-rw-r--r--include/java_lang_VMSystem.h28
3 files changed, 25 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 036626075..349fc61a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-03 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * include/Makefile.am:
+ Added rules for gnu.java.net.local.LocalSocketImpl.h
+ * include/java_lang_VMSystem.h:
+ Regenerated correctly.
+
2006-05-03 Sven de Marothy <sven@physto.se>
PR 24023, 24701
diff --git a/include/Makefile.am b/include/Makefile.am
index 72440cc01..5cda78e88 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -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_VMPlainDatagramSocketImpl.h: $(top_srcdir)/vm
$(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
diff --git a/include/java_lang_VMSystem.h b/include/java_lang_VMSystem.h
index 99ebfff7f..11b89ba27 100644
--- a/include/java_lang_VMSystem.h
+++ b/include/java_lang_VMSystem.h
@@ -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__ */