[kaffe] CVS kaffe (dalibor): Fixed many redundant declarations
Kaffe CVS
Kaffe Mailing List <kaffe@kaffe.org>
Sat Mar 27 08:39:02 2004
PatchSet 4585
Date: 2004/03/27 16:07:29
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed many redundant declarations
2004-03-27 Dalibor Topic <robilad@kaffe.org>
* include/native.h,
kaffe/kaffeh/support.c,
kaffe/kaffevm/support.h,
kaffe/kaffevm/mem/gc-mem.c,
libraries/clib/awt/X/imgjpeg.c,
libraries/clib/awt/X/imgpng.c,
libraries/clib/native/Arrays.c,
libraries/clib/native/Class.c,
libraries/clib/native/System.c,
libraries/clib/native/ThreadStack.c,
libraries/clib/net/NetworkInterface.c,
libraries/clib/net/PlainDatagramSocketImpl.c,
libraries/clib/net/PlainSocketImpl.c,
libraries/clib/nio/NIOServerSocket.c:
Removed many redundant declarations.
Members:
ChangeLog:1.2163->1.2164
include/native.h:1.12->1.13
kaffe/kaffeh/support.c:1.37->1.38
kaffe/kaffevm/support.h:1.27->1.28
kaffe/kaffevm/mem/gc-mem.c:1.54->1.55
libraries/clib/awt/X/imgjpeg.c:1.19->1.20
libraries/clib/awt/X/imgpng.c:1.20->1.21
libraries/clib/native/Arrays.c:1.3->1.4
libraries/clib/native/Class.c:1.69->1.70
libraries/clib/native/System.c:1.40->1.41
libraries/clib/native/ThreadStack.c:1.2->1.3
libraries/clib/net/NetworkInterface.c:1.6->1.7
libraries/clib/net/PlainDatagramSocketImpl.c:1.40->1.41
libraries/clib/net/PlainSocketImpl.c:1.40->1.41
libraries/clib/nio/NIOServerSocket.c:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2163 kaffe/ChangeLog:1.2164
--- kaffe/ChangeLog:1.2163 Fri Mar 26 22:58:38 2004
+++ kaffe/ChangeLog Sat Mar 27 16:07:29 2004
@@ -1,3 +1,21 @@
+2004-03-27 Dalibor Topic <robilad@kaffe.org>
+
+ * include/native.h,
+ kaffe/kaffeh/support.c,
+ kaffe/kaffevm/support.h,
+ kaffe/kaffevm/mem/gc-mem.c,
+ libraries/clib/awt/X/imgjpeg.c,
+ libraries/clib/awt/X/imgpng.c,
+ libraries/clib/native/Arrays.c,
+ libraries/clib/native/Class.c,
+ libraries/clib/native/System.c,
+ libraries/clib/native/ThreadStack.c,
+ libraries/clib/net/NetworkInterface.c,
+ libraries/clib/net/PlainDatagramSocketImpl.c,
+ libraries/clib/net/PlainSocketImpl.c,
+ libraries/clib/nio/NIOServerSocket.c:
+ Removed many redundant declarations.
+
2004-03-26 Adam Heath <doogie@debian.org>
* kaffe/kaffeh/main.c,
Index: kaffe/include/native.h
diff -u kaffe/include/native.h:1.12 kaffe/include/native.h:1.13
--- kaffe/include/native.h:1.12 Mon Mar 8 21:21:02 2004
+++ kaffe/include/native.h Sat Mar 27 16:07:31 2004
@@ -62,28 +62,15 @@
typedef Hjava_lang_Object HObject;
typedef Hjava_lang_String HString;
-/*
- * Function used for Kaffe Native Interface (KNI).
- */
-extern jvalue do_execute_java_method(void*, const char*, const char*, Method*, int, ...);
-extern jvalue do_execute_java_class_method(const char*, struct Hjava_lang_ClassLoader*, const char*, const char*, ...);
-extern HObject* execute_java_constructor(const char*, struct Hjava_lang_ClassLoader*, HClass*, const char*, ...);
-
extern char* stringJava2CBuf(const HString*, char*, int);
extern char* stringJava2C(const HString*);
extern HString* stringC2Java(const char*);
extern int utf8ConstEqualJavaString(const Utf8Const*, const HString*);
-extern void SignalError(const char*, const char*) __NORETURN__;
-
extern HObject* AllocObject(const char*, struct Hjava_lang_ClassLoader*);
extern HObject* AllocArray(int, int);
extern HObject* AllocObjectArray(int, const char*, struct Hjava_lang_ClassLoader*);
-
-extern void addNativeMethod(const char*, void*);
-
-extern void classname2pathname(const char*, char*);
/*
* Define KMALLOC, KFREE, etc.
Index: kaffe/kaffe/kaffeh/support.c
diff -u kaffe/kaffe/kaffeh/support.c:1.37 kaffe/kaffe/kaffeh/support.c:1.38
--- kaffe/kaffe/kaffeh/support.c:1.37 Mon Mar 8 21:21:06 2004
+++ kaffe/kaffe/kaffeh/support.c Sat Mar 27 16:07:32 2004
@@ -151,8 +151,6 @@
};
-extern struct _Collector* main_collector; /* in mem.c */
-
/*
* Ensure that files are opened in binary mode; the MS-Windows port
* depends on this.
Index: kaffe/kaffe/kaffevm/support.h
diff -u kaffe/kaffe/kaffevm/support.h:1.27 kaffe/kaffe/kaffevm/support.h:1.28
--- kaffe/kaffe/kaffevm/support.h:1.27 Tue Mar 23 21:22:50 2004
+++ kaffe/kaffe/kaffevm/support.h Sat Mar 27 16:07:32 2004
@@ -13,6 +13,7 @@
#define __support_h
#include "config-std.h"
+#include "gtypes.h"
#include <stdarg.h>
/* For user defined properties */
Index: kaffe/kaffe/kaffevm/mem/gc-mem.c
diff -u kaffe/kaffe/kaffevm/mem/gc-mem.c:1.54 kaffe/kaffe/kaffevm/mem/gc-mem.c:1.55
--- kaffe/kaffe/kaffevm/mem/gc-mem.c:1.54 Tue Mar 23 21:22:51 2004
+++ kaffe/kaffe/kaffevm/mem/gc-mem.c Sat Mar 27 16:07:32 2004
@@ -41,7 +41,6 @@
static gc_block* gc_large_block(size_t);
static gc_block* gc_primitive_alloc(size_t);
-void gc_primitive_free(gc_block*);
/**
* A preallocated block for small objects.
Index: kaffe/libraries/clib/awt/X/imgjpeg.c
diff -u kaffe/libraries/clib/awt/X/imgjpeg.c:1.19 kaffe/libraries/clib/awt/X/imgjpeg.c:1.20
--- kaffe/libraries/clib/awt/X/imgjpeg.c:1.19 Thu Jul 17 05:59:00 2003
+++ kaffe/libraries/clib/awt/X/imgjpeg.c Sat Mar 27 16:07:32 2004
@@ -31,12 +31,6 @@
#define CM_GREEN 1
#define CM_BLUE 2
-/* references to img.c */
-Image* createImage ( int width, int height );
-void Java_java_awt_Toolkit_imgFreeImage( JNIEnv* env, jclass clazz, Image * img);
-void createXImage ( Toolkit* X, Image* img );
-
-
#ifdef INCLUDE_JPEG
/*******************************************************************************************
Index: kaffe/libraries/clib/awt/X/imgpng.c
diff -u kaffe/libraries/clib/awt/X/imgpng.c:1.20 kaffe/libraries/clib/awt/X/imgpng.c:1.21
--- kaffe/libraries/clib/awt/X/imgpng.c:1.20 Mon Jan 13 23:27:53 2003
+++ kaffe/libraries/clib/awt/X/imgpng.c Sat Mar 27 16:07:32 2004
@@ -25,11 +25,6 @@
/* references to img.c */
-Image* createImage ( int width, int height );
-void Java_java_awt_Toolkit_imgFreeImage( JNIEnv* env, jclass clazz, Image * img);
-void createXImage ( Toolkit* X, Image* img );
-void createXMaskImage ( Toolkit* X, Image* img );
-void createAlphaImage ( Toolkit* X, Image* img );
void reduceAlpha ( Toolkit* X, Image* img, int threshold );
Index: kaffe/libraries/clib/native/Arrays.c
diff -u kaffe/libraries/clib/native/Arrays.c:1.3 kaffe/libraries/clib/native/Arrays.c:1.4
--- kaffe/libraries/clib/native/Arrays.c:1.3 Thu Dec 2 18:39:57 1999
+++ kaffe/libraries/clib/native/Arrays.c Sat Mar 27 16:07:33 2004
@@ -15,9 +15,10 @@
#include "config.h"
#include "config-std.h"
-#include <native.h>
-#include "../../../kaffe/kaffevm/gtypes.h"
-#include "../../../kaffe/kaffevm/fp.h"
+#include "native.h"
+#include "gtypes.h"
+#include "fp.h"
+#include "support.h"
#include "java_util_Comparator.h"
#include "java_util_Arrays.h"
Index: kaffe/libraries/clib/native/Class.c
diff -u kaffe/libraries/clib/native/Class.c:1.69 kaffe/libraries/clib/native/Class.c:1.70
--- kaffe/libraries/clib/native/Class.c:1.69 Sun Aug 31 22:09:15 2003
+++ kaffe/libraries/clib/native/Class.c Sat Mar 27 16:07:33 2004
@@ -37,8 +37,6 @@
#include "defs.h"
-extern Hjava_lang_Object* buildStackTrace(struct _exceptionFrame*);
-
/*
* Convert string name to class object.
*/
Index: kaffe/libraries/clib/native/System.c
diff -u kaffe/libraries/clib/native/System.c:1.40 kaffe/libraries/clib/native/System.c:1.41
--- kaffe/libraries/clib/native/System.c:1.40 Fri Feb 20 15:59:40 2004
+++ kaffe/libraries/clib/native/System.c Sat Mar 27 16:07:33 2004
@@ -46,11 +46,8 @@
static char cwdpath[MAXPATHLEN];
-extern jlong currentTime(void);
-extern userProperty* userProperties;
extern char* realClassPath;
extern char* realBootClassPath;
-extern jint java_lang_Object_hashCode(struct Hjava_lang_Object*);
extern void printStackTrace(struct Hjava_lang_Throwable*,
struct Hjava_lang_Object*, int);
Index: kaffe/libraries/clib/native/ThreadStack.c
diff -u kaffe/libraries/clib/native/ThreadStack.c:1.2 kaffe/libraries/clib/native/ThreadStack.c:1.3
--- kaffe/libraries/clib/native/ThreadStack.c:1.2 Sun Jul 27 16:53:46 2003
+++ kaffe/libraries/clib/native/ThreadStack.c Sat Mar 27 16:07:33 2004
@@ -24,8 +24,6 @@
#include "../../../kaffe/kaffevm/stackTrace.h"
#include "../../../kaffe/kaffevm/support.h"
-extern Hjava_lang_Object* buildStackTrace(struct _exceptionFrame*);
-
HArrayOfObject* /* HArrayOfClass */
kaffe_lang_ThreadStack_getClassStack(void)
{
Index: kaffe/libraries/clib/net/NetworkInterface.c
diff -u kaffe/libraries/clib/net/NetworkInterface.c:1.6 kaffe/libraries/clib/net/NetworkInterface.c:1.7
--- kaffe/libraries/clib/net/NetworkInterface.c:1.6 Thu Sep 18 15:26:55 2003
+++ kaffe/libraries/clib/net/NetworkInterface.c Sat Mar 27 16:07:33 2004
@@ -19,9 +19,9 @@
#include "config-net.h"
#include "config-io.h"
#include "config-hacks.h"
-#include <native.h>
#include "java_net_NetworkInterface.h"
#include "nets.h"
+#include "support.h"
#include <arpa/inet.h>
#include <jsyscall.h>
#include "../../../kaffe/kaffevm/debug.h"
Index: kaffe/libraries/clib/net/PlainDatagramSocketImpl.c
diff -u kaffe/libraries/clib/net/PlainDatagramSocketImpl.c:1.40 kaffe/libraries/clib/net/PlainDatagramSocketImpl.c:1.41
--- kaffe/libraries/clib/net/PlainDatagramSocketImpl.c:1.40 Sun Jan 25 21:13:11 2004
+++ kaffe/libraries/clib/net/PlainDatagramSocketImpl.c Sat Mar 27 16:07:33 2004
@@ -16,7 +16,7 @@
#include "config-net.h"
#include "config-io.h"
#include "config-hacks.h"
-#include <native.h>
+#include "support.h"
#include "java_lang_Integer.h"
#include "java_io_FileDescriptor.h"
#include "java_io_InterruptedIOException.h"
Index: kaffe/libraries/clib/net/PlainSocketImpl.c
diff -u kaffe/libraries/clib/net/PlainSocketImpl.c:1.40 kaffe/libraries/clib/net/PlainSocketImpl.c:1.41
--- kaffe/libraries/clib/net/PlainSocketImpl.c:1.40 Wed Mar 24 22:54:52 2004
+++ kaffe/libraries/clib/net/PlainSocketImpl.c Sat Mar 27 16:07:33 2004
@@ -13,7 +13,7 @@
#include "config-io.h"
#include "config-mem.h"
#include "config-net.h"
-#include <native.h>
+#include "support.h"
#include "java_io_FileDescriptor.h"
#include "java_lang_Integer.h"
#include "java_net_SocketImpl.h"
Index: kaffe/libraries/clib/nio/NIOServerSocket.c
diff -u kaffe/libraries/clib/nio/NIOServerSocket.c:1.1 kaffe/libraries/clib/nio/NIOServerSocket.c:1.2
--- kaffe/libraries/clib/nio/NIOServerSocket.c:1.1 Tue Oct 28 12:29:32 2003
+++ kaffe/libraries/clib/nio/NIOServerSocket.c Sat Mar 27 16:07:33 2004
@@ -8,7 +8,7 @@
*/
#include "config.h"
-#include "native.h"
+#include "support.h"
/* Classpath uses the same name for different variables in the inheritancy
* tree. Kaffeh treats them straightly and it confuses the compiler.