boehm-gc: revert all CACAO-specific modifications; this is now an exact copy of the...

[cacao.git] / src / mm / boehm-gc / include / private / gc_locks.h

diff --git a/src/mm/boehm-gc/include/private/gc_locks.h b/src/mm/boehm-gc/include/private/gc_locks.h
index d7c83b07b9129ea6ab604a456df04a83479a867c..467c1a536a440b2ac583cdeff02cb8158d5ee761 100644 (file)
--- a/src/mm/boehm-gc/include/private/gc_locks.h
+++ b/src/mm/boehm-gc/include/private/gc_locks.h
@@ -29,15 +29,15 @@
 # ifdef THREADS
 #  include <atomic_ops.h>
 
-   void GC_noop1(word);
+   GC_API void GC_CALL GC_noop1(word);
 #  ifdef PCR
 #    include <base/PCR_Base.h>
 #    include <th/PCR_Th.h>
      extern PCR_Th_ML GC_allocate_ml;
 #    define DCL_LOCK_STATE \
         PCR_ERes GC_fastLockRes; PCR_sigset_t GC_old_sig_mask
-#    define LOCK() PCR_Th_ML_Acquire(&GC_allocate_ml)
-#    define UNLOCK() PCR_Th_ML_Release(&GC_allocate_ml)
+#    define UNCOND_LOCK() PCR_Th_ML_Acquire(&GC_allocate_ml)
+#    define UNCOND_UNLOCK() PCR_Th_ML_Release(&GC_allocate_ml)
 #  endif
 
 #  if !defined(AO_HAVE_test_and_set_acquire) && defined(GC_PTHREADS)
@@ -102,7 +102,7 @@
 #        undef NUMERIC_THREAD_ID_UNIQUE
 #      endif
 #    endif
-#    define NO_THREAD (-1l)
+#    define NO_THREAD ((unsigned long)(-1l))
                /* != NUMERIC_THREAD_ID(pthread_self()) for any thread */
 
 #    if !defined(THREAD_LOCAL_ALLOC) && !defined(USE_PTHREAD_LOCKS)
@@ -187,7 +187,7 @@
 #   define I_HOLD_LOCK() TRUE
 #   define I_DONT_HOLD_LOCK() TRUE
                        /* Used only in positive assertions or to test whether  */
-                       /* we still need to acaquire the lock.  TRUE works in   */
+                       /* we still need to acquire the lock.  TRUE works in    */
                        /* either case.                                         */
 # endif /* !THREADS */