[kaffe] CVS kaffe (guilhem): Use MAIN_MD and check for THREAD_SYSTEM_HAS_KSEM in ksem.*

[Kaffe CVS]

PatchSet 5235 
Date: 2004/09/29 19:35:38
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Use MAIN_MD and check for THREAD_SYSTEM_HAS_KSEM in ksem.*

2004-09-29  Guilhem Lavaux  <guilhem at kaffe.org>

        * kaffe/kaffe/main.c
        (main): Added a call to MAIN_MD if available.

2004-09-29  Alexsander Boettscher  <ab764283 at os.inf.tu-dresden.de>

        * kaffe/kaffevm/ksem.c: Build OS independent code only if
        THREAD_SYSTEM_HAS_KSEM is undefined.

        * kaffe/kaffevm/ksem.h: Hide definition of ksem functions if
        THREAD_SYSTEM_HAS_KSEM is defined.

Members: 
	ChangeLog:1.2789->1.2790 
	kaffe/kaffe/main.c:1.64->1.65 
	kaffe/kaffevm/ksem.c:1.7->1.8 
	kaffe/kaffevm/ksem.h:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2789 kaffe/ChangeLog:1.2790
--- kaffe/ChangeLog:1.2789	Wed Sep 29 16:44:06 2004
+++ kaffe/ChangeLog	Wed Sep 29 19:35:38 2004
@@ -1,3 +1,16 @@
+2004-09-29  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* kaffe/kaffe/main.c
+	(main): Added a call to MAIN_MD if available.
+
+2004-09-29  Alexsander Boettscher  <ab764283 at os.inf.tu-dresden.de>
+	
+	* kaffe/kaffevm/ksem.c: Build OS independent code only if
+	THREAD_SYSTEM_HAS_KSEM is undefined.
+
+	* kaffe/kaffevm/ksem.h: Hide definition of ksem functions if
+	THREAD_SYSTEM_HAS_KSEM is defined.
+	
 2004-09-29  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/java/lang/String.java:
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.64 kaffe/kaffe/kaffe/main.c:1.65
--- kaffe/kaffe/kaffe/main.c:1.64	Sat Jul 24 08:05:57 2004
+++ kaffe/kaffe/kaffe/main.c	Wed Sep 29 19:35:42 2004
@@ -88,6 +88,10 @@
 	int farg;
 	const char* cp;
 
+#if defined(MAIN_MD)
+	MAIN_MD;
+#endif
+
 #if defined(HAVE_LC_MESSAGES)
 	setlocale(LC_MESSAGES, "");
 	setlocale(LC_CTYPE, "");
Index: kaffe/kaffe/kaffevm/ksem.c
diff -u kaffe/kaffe/kaffevm/ksem.c:1.7 kaffe/kaffe/kaffevm/ksem.c:1.8
--- kaffe/kaffe/kaffevm/ksem.c:1.7	Mon Aug  2 10:44:56 2004
+++ kaffe/kaffe/kaffevm/ksem.c	Wed Sep 29 19:35:43 2004
@@ -10,6 +10,8 @@
 
 #include "ksem.h"
 
+#ifndef THREAD_SYSTEM_HAS_KSEM
+
 /*
  * Initialize the just-allocated Ksem.  This function is only invoked
  * by the threading system when a new thread is allocated.
@@ -86,3 +88,5 @@
 	jmutex_destroy(&(sem->mux));
 	jcondvar_destroy(&(sem->cv));
 }
+
+#endif
Index: kaffe/kaffe/kaffevm/ksem.h
diff -u kaffe/kaffe/kaffevm/ksem.h:1.8 kaffe/kaffe/kaffevm/ksem.h:1.9
--- kaffe/kaffe/kaffevm/ksem.h:1.8	Tue Apr 20 16:53:25 2004
+++ kaffe/kaffe/kaffevm/ksem.h	Wed Sep 29 19:35:43 2004
@@ -20,11 +20,6 @@
  */
 struct Ksem;
 
-extern void ksemInit(struct Ksem* sem);
-extern void ksemPut(struct Ksem* sem);
-extern jboolean ksemGet(struct Ksem* sem, jlong timeout);
-extern void ksemDestroy(struct Ksem* sem);
-
 /*
  * Include the system locking layer interface.  See if it gives us
  * Ksem's or jmutex/jcondvar's (see FAQ.locks).
@@ -44,6 +39,11 @@
  */
 #ifndef THREAD_SYSTEM_HAS_KSEM
 
+ extern void ksemInit(struct Ksem* sem);
+ extern void ksemPut(struct Ksem* sem);
+ extern jboolean ksemGet(struct Ksem* sem, jlong timeout);
+ extern void ksemDestroy(struct Ksem* sem);
+
 /*
  * Present POSIX mutex+condvar as a binary semaphore.
  */
@@ -52,6 +52,5 @@
 	jcondvar	cv;
 	int		count;
 } Ksem;
-
 #endif /* !defined(JTHREAD_HAS_KSEM) */
 #endif /* kaffevm_ksem_h */