[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit da83446b26e3991e418648edc395b115daa7e028
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Mon Mar 12 13:09:01 2012 +0100

    fix: conflicting types

diff --git a/Singular/simpleipc.h b/Singular/simpleipc.h
index f51f768..e9736a7 100644
--- a/Singular/simpleipc.h
+++ b/Singular/simpleipc.h
@@ -11,10 +11,10 @@ extern "C"
 
 int sipc_semaphore_init(int id, int count);
 int sipc_semaphore_exists(int id);
-void sipc_semaphore_acquire(int id);
+int sipc_semaphore_acquire(int id);
 int sipc_semaphore_try_acquire(int id);
 int sipc_semaphore_get_value(int id);
-void sipc_semaphore_release(int id);
+int sipc_semaphore_release(int id);
 
 int simpleipc_cmd(char *cmd, int id, int v);
 #ifdef __cplusplus

-- 
an open source computer algebra system