From f3f70257a3befb6495760923d167e52d5cdfddae Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Sat, 26 May 2001 20:49:01 +0000 Subject: [PATCH] revert the ill-considered part of 2001-05-23 changes --- ChangeLog | 4 ++++ NEWS | 11 +++-------- acconfig.h | 5 ----- configure.in | 16 ++-------------- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b04c5ab2..e4eecbc30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-05-26 Michael Livshin + + revert the controversial part of the 2001-05-23 changes + 2001-05-23 Michael Livshin * configure.in: configury for SCM_[U]BITS_T, some more sizeofs. diff --git a/NEWS b/NEWS index 9238563d1..724a3589e 100644 --- a/NEWS +++ b/NEWS @@ -945,10 +945,6 @@ of lists of same. They are of questionable utility and they pollute the global namespace. -** New macro: SCM_BITS_LENGTH. - -The bit size of an SCM. - ** Deprecated typedef: scm_sizet It is of questionable utility now that Guile requires ANSI C, and is @@ -970,16 +966,15 @@ bignums directly, and should deal with numbers in general (which can be bignums). ** New functions: scm_short2num, scm_ushort2num, scm_int2num, - scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num, - scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int, - scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff, + scm_uint2num, scm_size2num, scm_ptrdiff2num, scm_num2short, + scm_num2ushort, scm_num2int, scm_num2uint, scm_num2ptrdiff, scm_num2size. These are conversion functions between the various ANSI C integral types and Scheme numbers. ** New number validation macros: - SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF] + SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,INT,UINT}[_DEF] See above. diff --git a/acconfig.h b/acconfig.h index 35c37f95f..adfbc0bd1 100644 --- a/acconfig.h +++ b/acconfig.h @@ -167,10 +167,5 @@ /* Define if the compiler supports long longs. */ #undef HAVE_LONG_LONGS -/* SCM will actually be represented by this type. */ -#undef SCM_BITS_T -#undef SCM_UBITS_T -#undef SCM_SIZEOF_BITS_T - /* defined to signed long if doesn't exist: */ #undef ptrdiff_t diff --git a/configure.in b/configure.in index 89257b497..92d1c5444 100644 --- a/configure.in +++ b/configure.in @@ -179,20 +179,8 @@ fi AC_CHECK_SIZEOF(void *) -if test "$ac_cv_sizeof_long" -eq "$ac_cv_sizeof_void_p"; then - AC_DEFINE(SCM_BITS_T, long) - AC_DEFINE(SCM_UBITS_T, unsigned long) - AC_DEFINE(SCM_SIZEOF_BITS_T, SIZEOF_LONG) -elif test \( "$scm_cv_long_longs" = yes \) -a \( "$ac_cv_sizeof_long_long" -eq "$ac_cv_sizeof_void_p" \); then - AC_DEFINE(SCM_BITS_T, long long) - AC_DEFINE(SCM_UBITS_T, unsigned long long) - AC_DEFINE(SCM_SIZEOF_BITS_T, SIZEOF_LONG_LONG) -elif test "$ac_cv_sizeof_int" -eq "$ac_cv_sizeof_void_p"; then - AC_DEFINE(SCM_BITS_T, int) - AC_DEFINE(SCM_UBITS_T, unsigned int) - AC_DEFINE(SCM_SIZEOF_BITS_T, SIZEOF_INT) -else - AC_MSG_ERROR(cannot find an integral type capable of storing a pointer: "$ac_cv_sizeof_void_p" bytes) +if test "$ac_cv_sizeof_long" -ne "$ac_cv_sizeof_void_p"; then + AC_MSG_ERROR(sizes of long and void* are not identical) fi AC_HEADER_STDC