* gc.h: replace usage of SIZEOF_LONG with

SCM_SIZEOF_UNSIGNED_LONG.  Replace usage of USE_PTHREAD_THREADS
with SCM_USE_PTHREAD_THREADS.  Remove SCM_SIZEOF_LONG definition
since we handle that in scmconfig.h now.

diff --git a/libguile/gc.h b/libguile/gc.h
index 13f1af8..106da56 100644 (file)
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -50,7 +50,7 @@
 
 #include "libguile/hooks.h"
 
-#ifdef USE_PTHREAD_THREADS
+#ifdef SCM_USE_PTHREAD_THREADS
 #include "libguile/pthread-threads.h"
 #else
 #include "libguile/null-threads.h"
@@ -137,15 +137,13 @@ typedef struct scm_t_cell
 /* low level bit banging aids */
 typedef unsigned long scm_t_c_bvec_long;
 
-#if (SIZEOF_LONG == 8)
+#if (SCM_SIZEOF_UNSIGNED_LONG == 8)
 #       define SCM_C_BVEC_LONG_BITS    64
 #       define SCM_C_BVEC_OFFSET_SHIFT 6
 #       define SCM_C_BVEC_POS_MASK     63
 #       define SCM_CELL_SIZE_SHIFT     4
-#      define SCM_SIZEOF_LONG SIZEOF_LONG
 #else
 #       define SCM_C_BVEC_LONG_BITS    32
-#      define SCM_SIZEOF_LONG SIZEOF_LONG
 #       define SCM_C_BVEC_OFFSET_SHIFT 5
 #       define SCM_C_BVEC_POS_MASK     31
 #       define SCM_CELL_SIZE_SHIFT     3