[kaffe] CVS kaffe (dalibor): Cleaned up headers
Kaffe CVS
cvs-commits at kaffe.org
Fri May 28 06:44:02 PDT 2004
PatchSet 4792
Date: 2004/05/28 13:40:09
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Cleaned up headers
2004-05-27 Michael Franz <developer.franz at verizon.net>
libraries/clib/awt/X/evt.c,
libraries/clib/awt/X/toolkit.h,
libraries/clib/io/AudioPlayer.c,
libraries/clib/io/File.c,
libraries/clib/io/ObjectInputStream.c,
libraries/clib/management/Classpath.c,
libraries/clib/management/Debug.c,
libraries/clib/management/JIT.c,
libraries/clib/management/XProfiler.c,
libraries/clib/net/InetAddressImpl.c,
libraries/clib/net/NetworkInterface.c,
libraries/clib/net/PlainDatagramSocketImpl.c,
libraries/clib/net/PlainSocketImpl.c,
libraries/clib/nio/FileChannelImpl.c,
libraries/clib/security/digest.c,
libraries/clib/zip/Adler32.c,
libraries/clib/zip/CRC32.c:
Cleaned up includes.
Members:
ChangeLog:1.2361->1.2362
libraries/clib/awt/X/evt.c:1.25->1.26
libraries/clib/awt/X/toolkit.h:1.30->1.31
libraries/clib/io/AudioPlayer.c:1.14->1.15
libraries/clib/io/File.c:1.23->1.24
libraries/clib/io/ObjectInputStream.c:1.1->1.2
libraries/clib/management/Classpath.c:1.6->1.7
libraries/clib/management/Debug.c:1.4->1.5
libraries/clib/management/JIT.c:1.5->1.6
libraries/clib/management/XProfiler.c:1.2->1.3
libraries/clib/net/InetAddressImpl.c:1.22->1.23
libraries/clib/net/NetworkInterface.c:1.8->1.9
libraries/clib/net/PlainDatagramSocketImpl.c:1.44->1.45
libraries/clib/net/PlainSocketImpl.c:1.44->1.45
libraries/clib/nio/FileChannelImpl.c:1.4->1.5
libraries/clib/security/digest.c:1.8->1.9
libraries/clib/zip/Adler32.c:1.6->1.7
libraries/clib/zip/CRC32.c:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2361 kaffe/ChangeLog:1.2362
--- kaffe/ChangeLog:1.2361 Thu May 27 21:42:45 2004
+++ kaffe/ChangeLog Fri May 28 13:40:09 2004
@@ -1,3 +1,24 @@
+2004-05-27 Michael Franz <developer.franz at verizon.net>
+
+ libraries/clib/awt/X/evt.c,
+ libraries/clib/awt/X/toolkit.h,
+ libraries/clib/io/AudioPlayer.c,
+ libraries/clib/io/File.c,
+ libraries/clib/io/ObjectInputStream.c,
+ libraries/clib/management/Classpath.c,
+ libraries/clib/management/Debug.c,
+ libraries/clib/management/JIT.c,
+ libraries/clib/management/XProfiler.c,
+ libraries/clib/net/InetAddressImpl.c,
+ libraries/clib/net/NetworkInterface.c,
+ libraries/clib/net/PlainDatagramSocketImpl.c,
+ libraries/clib/net/PlainSocketImpl.c,
+ libraries/clib/nio/FileChannelImpl.c,
+ libraries/clib/security/digest.c,
+ libraries/clib/zip/Adler32.c,
+ libraries/clib/zip/CRC32.c:
+ Cleaned up includes.
+
2004-05-27 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/nio/ByteBufferImpl.java,
Index: kaffe/libraries/clib/awt/X/evt.c
diff -u kaffe/libraries/clib/awt/X/evt.c:1.25 kaffe/libraries/clib/awt/X/evt.c:1.26
--- kaffe/libraries/clib/awt/X/evt.c:1.25 Mon Apr 5 05:30:16 2004
+++ kaffe/libraries/clib/awt/X/evt.c Fri May 28 13:40:11 2004
@@ -19,7 +19,7 @@
#if !defined (USE_POLLING_AWT)
#include "jsyscall.h"
-#include "../../../../kaffe/kaffevm/locks.h"
+#include "locks.h"
#if defined(UNIX_JTHREADS)
void jthreadedBlockEAGAIN(int fd); /* move to SysCallInterface ? */
Index: kaffe/libraries/clib/awt/X/toolkit.h
diff -u kaffe/libraries/clib/awt/X/toolkit.h:1.30 kaffe/libraries/clib/awt/X/toolkit.h:1.31
--- kaffe/libraries/clib/awt/X/toolkit.h:1.30 Mon Apr 5 05:30:16 2004
+++ kaffe/libraries/clib/awt/X/toolkit.h Fri May 28 13:40:11 2004
@@ -34,10 +34,10 @@
#include <jni.h>
-#include "../../../../kaffe/kaffevm/gtypes.h"
-#include "../../../../kaffe/kaffevm/gc.h"
-#include "../../../../kaffe/kaffevm/thread.h"
-#include "../../../../kaffe/kaffevm/debug.h"
+#include "gtypes.h"
+#include "gc.h"
+#include "thread.h"
+#include "debug.h"
#define DBG_ACTION(A,B)
Index: kaffe/libraries/clib/io/AudioPlayer.c
diff -u kaffe/libraries/clib/io/AudioPlayer.c:1.14 kaffe/libraries/clib/io/AudioPlayer.c:1.15
--- kaffe/libraries/clib/io/AudioPlayer.c:1.14 Sun Apr 18 13:57:28 2004
+++ kaffe/libraries/clib/io/AudioPlayer.c Fri May 28 13:40:12 2004
@@ -15,8 +15,8 @@
#include "defs.h"
#include "jsyscall.h"
#include "kaffe_applet_AudioPlayer.h"
-#include "../../../kaffe/kaffevm/support.h"
-#include "../../../kaffe/kaffevm/stringSupport.h"
+#include "support.h"
+#include "stringSupport.h"
void
kaffe_applet_AudioPlayer_playFile(struct Hjava_lang_String* jstr)
Index: kaffe/libraries/clib/io/File.c
diff -u kaffe/libraries/clib/io/File.c:1.23 kaffe/libraries/clib/io/File.c:1.24
--- kaffe/libraries/clib/io/File.c:1.23 Tue May 18 03:34:53 2004
+++ kaffe/libraries/clib/io/File.c Fri May 28 13:40:12 2004
@@ -26,8 +26,8 @@
#include "files.h"
#include "../../../include/system.h"
#include "java_io_VMFile.h"
-#include "../../../kaffe/kaffevm/support.h"
-#include "../../../kaffe/kaffevm/stringSupport.h"
+#include "support.h"
+#include "stringSupport.h"
/*
* Is named item a file?
Index: kaffe/libraries/clib/io/ObjectInputStream.c
diff -u kaffe/libraries/clib/io/ObjectInputStream.c:1.1 kaffe/libraries/clib/io/ObjectInputStream.c:1.2
--- kaffe/libraries/clib/io/ObjectInputStream.c:1.1 Mon Apr 12 11:40:06 2004
+++ kaffe/libraries/clib/io/ObjectInputStream.c Fri May 28 13:40:12 2004
@@ -10,12 +10,12 @@
#include "config-std.h"
#include <kaffe/jtypes.h>
#include <native.h>
-#include "../../../kaffe/kaffevm/object.h"
-#include "../../../kaffe/kaffevm/classMethod.h"
-#include "../../../kaffe/kaffevm/exception.h"
-#include "../../../kaffe/kaffevm/lookup.h"
-#include "../../../kaffe/kaffevm/soft.h"
-#include "../../../kaffe/kaffevm/support.h"
+#include "object.h"
+#include "classMethod.h"
+#include "exception.h"
+#include "lookup.h"
+#include "soft.h"
+#include "support.h"
#include "java_lang_SecurityManager.h"
#include "java_io_ObjectInputStream.h"
#include "java_lang_reflect_Field.h"
Index: kaffe/libraries/clib/management/Classpath.c
diff -u kaffe/libraries/clib/management/Classpath.c:1.6 kaffe/libraries/clib/management/Classpath.c:1.7
--- kaffe/libraries/clib/management/Classpath.c:1.6 Sun Oct 17 21:33:00 1999
+++ kaffe/libraries/clib/management/Classpath.c Fri May 28 13:40:12 2004
@@ -11,9 +11,9 @@
#include "config.h"
#include "config-std.h"
#include <native.h>
-#include "../../../kaffe/kaffevm/gtypes.h"
-#include "../../../kaffe/kaffevm/support.h"
-#include "../../../kaffe/kaffevm/stringSupport.h"
+#include "gtypes.h"
+#include "support.h"
+#include "stringSupport.h"
#include "kaffe_management_Classpath.h"
/*
Index: kaffe/libraries/clib/management/Debug.c
diff -u kaffe/libraries/clib/management/Debug.c:1.4 kaffe/libraries/clib/management/Debug.c:1.5
--- kaffe/libraries/clib/management/Debug.c:1.4 Sun Apr 18 13:57:28 2004
+++ kaffe/libraries/clib/management/Debug.c Fri May 28 13:40:12 2004
@@ -1,9 +1,9 @@
#include "config.h"
#include "config-std.h"
#include "config-mem.h"
-#include "../../../kaffe/kaffevm/gtypes.h"
+#include "gtypes.h"
#include "kaffe_management_Debug.h"
-#include "../../../kaffe/kaffevm/debug.h"
+#include "debug.h"
void
Java_kaffe_management_Debug_enable
Index: kaffe/libraries/clib/management/JIT.c
diff -u kaffe/libraries/clib/management/JIT.c:1.5 kaffe/libraries/clib/management/JIT.c:1.6
--- kaffe/libraries/clib/management/JIT.c:1.5 Sun Apr 18 13:57:28 2004
+++ kaffe/libraries/clib/management/JIT.c Fri May 28 13:40:12 2004
@@ -14,12 +14,12 @@
#include "config-std.h"
#include "../../../kaffe/kaffevm/gtypes.h"
#include "kaffe_management_JIT.h"
-#include "../../../kaffe/kaffevm/classMethod.h"
-#include "../../../kaffe/kaffevm/lookup.h"
-#include "../../../kaffe/kaffevm/support.h"
-#include "../../../kaffe/kaffevm/debug.h"
-#include "../../../kaffe/kaffevm/stringSupport.h"
-#include "../../../kaffe/kaffevm/methodCache.h"
+#include "classMethod.h"
+#include "lookup.h"
+#include "support.h"
+#include "debug.h"
+#include "stringSupport.h"
+#include "methodCache.h"
/* XXX Temporary for now until we define interface header file that
* declares "translate"
Index: kaffe/libraries/clib/management/XProfiler.c
diff -u kaffe/libraries/clib/management/XProfiler.c:1.2 kaffe/libraries/clib/management/XProfiler.c:1.3
--- kaffe/libraries/clib/management/XProfiler.c:1.2 Sun Apr 18 13:57:28 2004
+++ kaffe/libraries/clib/management/XProfiler.c Fri May 28 13:40:12 2004
@@ -14,10 +14,10 @@
*/
#include "config.h"
-#include "../../../kaffe/kaffevm/gtypes.h"
+#include "gtypes.h"
#include "../../../kaffe/xprof/xprofiler.h"
#include "kaffe_management_XProfiler.h"
-#include "../../../kaffe/kaffevm/stringSupport.h"
+#include "stringSupport.h"
#include <native.h>
void Java_kaffe_management_XProfiler_on(JNIEnv *env UNUSED, jclass clazz UNUSED)
Index: kaffe/libraries/clib/net/InetAddressImpl.c
diff -u kaffe/libraries/clib/net/InetAddressImpl.c:1.22 kaffe/libraries/clib/net/InetAddressImpl.c:1.23
--- kaffe/libraries/clib/net/InetAddressImpl.c:1.22 Sun Apr 18 13:57:29 2004
+++ kaffe/libraries/clib/net/InetAddressImpl.c Fri May 28 13:40:13 2004
@@ -14,12 +14,12 @@
#include "config-net.h"
#include "config-io.h"
#include <arpa/inet.h>
-#include "../../../kaffe/kaffevm/gtypes.h"
-#include "../../../kaffe/kaffevm/object.h"
+#include "gtypes.h"
+#include "object.h"
#include <native.h>
-#include "../../../kaffe/kaffevm/itypes.h"
-#include "../../../kaffe/kaffevm/stringSupport.h"
-#include "../../../kaffe/kaffevm/support.h"
+#include "itypes.h"
+#include "stringSupport.h"
+#include "support.h"
#include "java_net_InetAddress.h"
#include "gnu_java_net_SysInetAddressImpl.h"
#include "nets.h"
Index: kaffe/libraries/clib/net/NetworkInterface.c
diff -u kaffe/libraries/clib/net/NetworkInterface.c:1.8 kaffe/libraries/clib/net/NetworkInterface.c:1.9
--- kaffe/libraries/clib/net/NetworkInterface.c:1.8 Mon May 17 22:25:02 2004
+++ kaffe/libraries/clib/net/NetworkInterface.c Fri May 28 13:40:13 2004
@@ -24,7 +24,7 @@
#include "support.h"
#include <arpa/inet.h>
#include <jsyscall.h>
-#include "../../../kaffe/kaffevm/debug.h"
+#include "debug.h"
#include <ifaddrs.h>
Index: kaffe/libraries/clib/net/PlainDatagramSocketImpl.c
diff -u kaffe/libraries/clib/net/PlainDatagramSocketImpl.c:1.44 kaffe/libraries/clib/net/PlainDatagramSocketImpl.c:1.45
--- kaffe/libraries/clib/net/PlainDatagramSocketImpl.c:1.44 Mon May 17 22:25:03 2004
+++ kaffe/libraries/clib/net/PlainDatagramSocketImpl.c Fri May 28 13:40:13 2004
@@ -30,9 +30,9 @@
#include "nets.h"
#include <jsyscall.h>
#include "Arrays.h"
-#include "../../../kaffe/kaffevm/debug.h"
-#include "../../../kaffe/kaffevm/itypes.h"
-#include "../../../kaffe/kaffevm/exception.h"
+#include "debug.h"
+#include "itypes.h"
+#include "exception.h"
#include "dummyin6.h"
Index: kaffe/libraries/clib/net/PlainSocketImpl.c
diff -u kaffe/libraries/clib/net/PlainSocketImpl.c:1.44 kaffe/libraries/clib/net/PlainSocketImpl.c:1.45
--- kaffe/libraries/clib/net/PlainSocketImpl.c:1.44 Fri Apr 23 15:12:49 2004
+++ kaffe/libraries/clib/net/PlainSocketImpl.c Fri May 28 13:40:13 2004
@@ -23,10 +23,10 @@
#include "nets.h"
#include <jsyscall.h>
#include <jthread.h>
-#include "../../../kaffe/kaffevm/debug.h"
-#include "../../../kaffe/kaffevm/object.h"
-#include "../../../kaffe/kaffevm/itypes.h"
-#include "../../../kaffe/kaffevm/exception.h"
+#include "debug.h"
+#include "object.h"
+#include "itypes.h"
+#include "exception.h"
#include "dummyin6.h"
Index: kaffe/libraries/clib/nio/FileChannelImpl.c
diff -u kaffe/libraries/clib/nio/FileChannelImpl.c:1.4 kaffe/libraries/clib/nio/FileChannelImpl.c:1.5
--- kaffe/libraries/clib/nio/FileChannelImpl.c:1.4 Thu Apr 22 16:28:17 2004
+++ kaffe/libraries/clib/nio/FileChannelImpl.c Fri May 28 13:40:13 2004
@@ -14,9 +14,9 @@
#include "defs.h"
#include "jsyscall.h"
#include "jni.h"
-#include "../../../kaffe/kaffevm/classMethod.h"
-#include "../../../kaffe/kaffevm/utf8const.h"
-#include "../../../kaffe/kaffevm/support.h"
+#include "classMethod.h"
+#include "utf8const.h"
+#include "support.h"
#include "gnu_java_nio_channels_FileChannelImpl.h"
#include "java_nio_MappedByteBufferImpl.h"
Index: kaffe/libraries/clib/security/digest.c
diff -u kaffe/libraries/clib/security/digest.c:1.8 kaffe/libraries/clib/security/digest.c:1.9
--- kaffe/libraries/clib/security/digest.c:1.8 Mon May 24 17:55:51 2004
+++ kaffe/libraries/clib/security/digest.c Fri May 28 13:40:13 2004
@@ -16,14 +16,14 @@
#include "config.h"
#include "config-std.h"
#include "config-mem.h"
-#include "../../../kaffe/kaffevm/classMethod.h"
-#include "../../../kaffe/kaffevm/gtypes.h"
-#include "../../../kaffe/kaffevm/locks.h"
-#include "../../../kaffe/kaffevm/object.h"
-#include "../../../kaffe/kaffevm/itypes.h"
-#include "../../../kaffe/kaffevm/exception.h"
-#include "../../../kaffe/kaffevm/stringSupport.h"
-#include "../../../kaffe/kaffevm/fp.h"
+#include "classMethod.h"
+#include "gtypes.h"
+#include "locks.h"
+#include "object.h"
+#include "itypes.h"
+#include "exception.h"
+#include "stringSupport.h"
+#include "fp.h"
#include "sha-1.h"
#include <native.h>
#include "kaffe_security_provider_MD2.h"
Index: kaffe/libraries/clib/zip/Adler32.c
diff -u kaffe/libraries/clib/zip/Adler32.c:1.6 kaffe/libraries/clib/zip/Adler32.c:1.7
--- kaffe/libraries/clib/zip/Adler32.c:1.6 Sun Apr 18 13:57:31 2004
+++ kaffe/libraries/clib/zip/Adler32.c Fri May 28 13:40:14 2004
@@ -13,7 +13,7 @@
#include "config-mem.h"
#include <native.h>
#include "java_util_zip_Adler32.h"
-#include "../../../kaffe/kaffevm/gtypes.h"
+#include "gtypes.h"
#if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
Index: kaffe/libraries/clib/zip/CRC32.c
diff -u kaffe/libraries/clib/zip/CRC32.c:1.6 kaffe/libraries/clib/zip/CRC32.c:1.7
--- kaffe/libraries/clib/zip/CRC32.c:1.6 Sun Apr 18 13:57:31 2004
+++ kaffe/libraries/clib/zip/CRC32.c Fri May 28 13:40:14 2004
@@ -13,7 +13,7 @@
#include "config-mem.h"
#include <native.h>
#include "java_util_zip_CRC32.h"
-#include "../../../kaffe/kaffevm/gtypes.h"
+#include "gtypes.h"
/*
* Table of CRC-32's of all single-byte values.
More information about the kaffe
mailing list