[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, master, updated. release_1-9-5-19-ga73
|
From: |
Ludovic Courtès |
|
Subject: |
[Guile-commits] GNU Guile branch, master, updated. release_1-9-5-19-ga7348a4 |
|
Date: |
Tue, 24 Nov 2009 22:48:02 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=a7348a497d0dcb3cc85ac0d82b289e86f6c360cc
The branch, master has been updated
via a7348a497d0dcb3cc85ac0d82b289e86f6c360cc (commit)
via 981ff600e85790b3f648371cacb18634eb636c64 (commit)
via feef98f203a7e504557cb5753f06abea96a63ff7 (commit)
via 48300bace86a4a35a0a6a6e582f651193dbc5f82 (commit)
via c4e843571f6dd5d7500e6886c00e6c213eabee30 (commit)
via 114bc68ac97d47b2e5635de98b111b47de85ed92 (commit)
via 45f1c6674995e14467f96f8bebc9da67a4d20132 (commit)
via b3eba3b2ff92b0ea2b1150242ef85bc245a10d9c (commit)
via 6b1bc6e56aa6cece3acb4ec2be5324dc3be04a05 (commit)
via 81adf76a26e4feaf5f8a1d5a44f2a5a617cffd84 (commit)
from c3b16a5d8e31b78b69a6937ff6024d0ff5dbfd8c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a7348a497d0dcb3cc85ac0d82b289e86f6c360cc
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 24 23:43:27 2009 +0100
Use $(PATH_SEPARATOR) where appropriate.
* examples/Makefile.am (AM_CFLAGS, AM_LIBS): Use $(PATH_SEPARATOR)
instead of `:'.
(installcheck): Likewise.
commit 981ff600e85790b3f648371cacb18634eb636c64
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 24 23:39:10 2009 +0100
Fix makefile indentation.
* benchmark-suite/Makefile.am, libguile/Makefile.am, meta/Makefile.am:
Use TAB instead of 8 spaces...
* .x-sc_makefile_check: New file.
commit feef98f203a7e504557cb5753f06abea96a63ff7
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 24 23:34:37 2009 +0100
Properly quote the first argument to `AC_DEFINE{,_UNQUOTED}'.
* acinclude.m4, configure.ac, examples/compat/acinclude.m4: Properly
quote the first argument for `AC_DEFINE' and `AC_DEFINE_UNQUOTED'.
* .x-sc_m4_quote_check: New file.
commit 48300bace86a4a35a0a6a6e582f651193dbc5f82
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 24 23:23:28 2009 +0100
Add `cfg.mk', for use by the top-level GNUmakefile.
* cfg.mk: New file, with 1.9.5 `NEWS' hash.
commit c4e843571f6dd5d7500e6886c00e6c213eabee30
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 24 23:16:08 2009 +0100
"filesystem" -> "file system"
* doc/ref/misc-modules.texi, doc/sources/unix.texi,
module/ice-9/ftw.scm: Replace "filesystem" by "file system".
commit 114bc68ac97d47b2e5635de98b111b47de85ed92
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 24 23:12:03 2009 +0100
Don't rely on `HAVE_' macros in public header "tags.h".
* configure.ac: Check for `intptr_t' and `uintptr_t'. Substitute
`SCM_I_GSC_T_INTPTR' and `SCM_I_GSC_T_UINPTR'.
* libguile/__scm.h (SCM_T_UINTPTR_MAX, SCM_T_INTPTR_MIN,
SCM_T_INTPTR_MAX): New macros.
* libguile/_scm.h (SIZEOF_SCM_T_BITS): New macro.
* libguile/gen-scmconfig.c (main): Produce typedefs for `scm_t_intptr'
and `scm_t_uintptr'.
* libguile/gen-scmconfig.h.in (SCM_I_GSC_T_INTPTR, SCM_I_GSC_T_UINPTR):
New macros.
* libguile/tags.h: Don't check for `HAVE_INTTYPES_H' and
`HAVE_STDINT_H'; don't include <inttypes.h> nor <stdint.h>.
(scm_t_signed_bits, scm_t_bits): Define unconditionally as aliases for
`scm_t_intptr' and `scm_t_uintptr', respectively.
(SCM_T_SIGNED_BITS_MAX, SCM_T_SIGNED_BITS_MIN, SCM_T_BITS_MAX):
Likewise.
(SIZEOF_SCM_T_BITS): Remove.
commit 45f1c6674995e14467f96f8bebc9da67a4d20132
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 24 22:25:49 2009 +0100
Remove unused, non-prefixed macros.
* libguile/__scm.h (BIGNUMS, TICKS): Remove.
commit b3eba3b2ff92b0ea2b1150242ef85bc245a10d9c
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 24 22:11:28 2009 +0100
Update to Gnulib v0.0-2923-g6575ab5.
commit 6b1bc6e56aa6cece3acb4ec2be5324dc3be04a05
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 24 22:07:16 2009 +0100
Really disable thread-local storage on NetBSD 5.0.
* acinclude.m4 (GUILE_THREAD_LOCAL_STORAGE): Adjust to match actual
NetBSD 5 triplet, `x86_64-unknown-netbsd5.0.' (note the final dot).
commit 81adf76a26e4feaf5f8a1d5a44f2a5a617cffd84
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 24 22:06:08 2009 +0100
Fix compilation `--without-threads'.
* configure.ac: For `--without-threads' and `--with-threads=null', set
`SCM_I_GSC_HAVE_THREAD_STORAGE_CLASS=0'. This fixes compilation of
`gen-scmconfig.c' in these cases.
-----------------------------------------------------------------------
Summary of changes:
.x-sc_m4_quote_check | 1 +
.x-sc_makefile_check | 3 +
acinclude.m4 | 8 ++--
benchmark-suite/Makefile.am | 2 +-
cfg.mk | 1 +
configure.ac | 97 ++++++++++++++++++++++++++++++-----------
doc/ref/misc-modules.texi | 6 +-
doc/sources/unix.texi | 2 +-
examples/Makefile.am | 12 +++---
examples/compat/acinclude.m4 | 2 +-
lib/duplocale.c | 19 +-------
libguile/Makefile.am | 2 +-
libguile/__scm.h | 17 ++------
libguile/_scm.h | 3 +
libguile/gen-scmconfig.c | 2 +
libguile/gen-scmconfig.h.in | 2 +
libguile/tags.h | 38 ++--------------
meta/Makefile.am | 4 +-
module/ice-9/ftw.scm | 8 ++--
19 files changed, 117 insertions(+), 112 deletions(-)
create mode 100644 .x-sc_m4_quote_check
create mode 100644 .x-sc_makefile_check
create mode 100644 cfg.mk
diff --git a/.x-sc_m4_quote_check b/.x-sc_m4_quote_check
new file mode 100644
index 0000000..6b09fcb
--- /dev/null
+++ b/.x-sc_m4_quote_check
@@ -0,0 +1 @@
+m4/version-etc.m4
diff --git a/.x-sc_makefile_check b/.x-sc_makefile_check
new file mode 100644
index 0000000..370b1d2
--- /dev/null
+++ b/.x-sc_makefile_check
@@ -0,0 +1,3 @@
+lib(guile)?/
+guile-readline/
+srfi/
diff --git a/acinclude.m4 b/acinclude.m4
index 7b2cfcb..fdf20d4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -57,7 +57,7 @@ AC_DEFUN([GUILE_HEADER_LIBC_WITH_UNISTD],
]
)
if test "$guile_cv_header_libc_with_unistd" = yes; then
- AC_DEFINE(LIBC_H_WITH_UNISTD_H, 1,
+ AC_DEFINE([LIBC_H_WITH_UNISTD_H], 1,
[Define this if we should include <libc.h> when we've already
included <unistd.h>. On some systems, they conflict, and libc.h
should be omitted. See GUILE_HEADER_LIBC_WITH_UNISTD in
@@ -267,7 +267,7 @@ if test "x$acx_pthread_ok" = xyes; then
done
AC_MSG_RESULT($attr_name)
if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
- AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+ AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], $attr_name,
[Define to necessary symbol if this constant
uses a non-standard name on your system.])
fi
@@ -302,7 +302,7 @@ AC_SUBST(PTHREAD_CC)
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
if test x"$acx_pthread_ok" = xyes; then
- ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX
threads libraries and header files.]),[$1])
+ ifelse([$1],,AC_DEFINE([HAVE_PTHREAD],1,[Define if you have POSIX
threads libraries and header files.]),[$1])
:
else
acx_pthread_ok=no
@@ -349,7 +349,7 @@ AC_DEFUN([GUILE_THREAD_LOCAL_STORAGE], [
dnl http://lists.gnu.org/archive/html/guile-devel/2009-10/msg00138.html
dnl for details.
case "x$enable_shared--$host" in
- xyes--*netbsd[0-5].[0-9])
+ xyes--*netbsd[0-5].[0-9].)
ac_cv_have_thread_storage_class="no"
;;
*)
diff --git a/benchmark-suite/Makefile.am b/benchmark-suite/Makefile.am
index dcadd58..dc35ed9 100644
--- a/benchmark-suite/Makefile.am
+++ b/benchmark-suite/Makefile.am
@@ -1,6 +1,6 @@
SCM_BENCHMARKS = benchmarks/0-reference.bm \
benchmarks/bytevectors.bm \
- benchmarks/continuations.bm \
+ benchmarks/continuations.bm \
benchmarks/if.bm \
benchmarks/logand.bm \
benchmarks/read.bm \
diff --git a/cfg.mk b/cfg.mk
new file mode 100644
index 0000000..dba616c
--- /dev/null
+++ b/cfg.mk
@@ -0,0 +1 @@
+old_NEWS_hash = d41d8cd98f00b204e9800998ecf8427e
diff --git a/configure.ac b/configure.ac
index bbf9e42..5ed153d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,7 @@ AC_ARG_ENABLE(debug-freelist,
AC_ARG_ENABLE(debug-malloc,
[ --enable-debug-malloc include malloc debugging code],
if test "$enable_debug_malloc" = y || test "$enable_debug_malloc" = yes; then
- AC_DEFINE(GUILE_DEBUG_MALLOC, 1,
+ AC_DEFINE([GUILE_DEBUG_MALLOC], 1,
[Define this if you want to debug scm_must_malloc/realloc/free calls.])
fi)
@@ -165,7 +165,7 @@ else
fi
SCM_I_GSC_ENABLE_DEPRECATED=1
fi
-AC_DEFINE_UNQUOTED(SCM_WARN_DEPRECATED_DEFAULT, "$warn_default",
+AC_DEFINE_UNQUOTED([SCM_WARN_DEPRECATED_DEFAULT], "$warn_default",
[Define this to control the default warning level for deprecated features.])
AC_ARG_ENABLE(elisp,
@@ -212,7 +212,7 @@ AC_ARG_WITH([64-calls],
AC_MSG_RESULT($use_64_calls)
case "$use_64_calls" in
y* )
- AC_DEFINE(GUILE_USE_64_CALLS, 1,
+ AC_DEFINE([GUILE_USE_64_CALLS], 1,
[Define to 1 in order to try to use "64" versions of system and library
calls.])
;;
esac
@@ -247,14 +247,14 @@ fi
if test "$enable_posix" = yes; then
AC_LIBOBJ([filesys])
AC_LIBOBJ([posix])
- AC_DEFINE(HAVE_POSIX, 1,
+ AC_DEFINE([HAVE_POSIX], 1,
[Define this if you want support for POSIX system calls in Guile.])
fi
if test "$enable_networking" = yes; then
AC_LIBOBJ([net_db])
AC_LIBOBJ([socket])
- AC_DEFINE(HAVE_NETWORKING, 1,
+ AC_DEFINE([HAVE_NETWORKING], 1,
[Define this if you want support for networking in Guile.])
fi
@@ -355,6 +355,8 @@ if test "$ac_cv_header_stdint_h" = yes; then
AC_CHECK_TYPE([uint64_t],[scm_stdint_has_uint64=1],,[#include <stdint.h>])
AC_CHECK_TYPE([intmax_t],[scm_stdint_has_intmax=1],,[#include <stdint.h>])
AC_CHECK_TYPE([uintmax_t],[scm_stdint_has_uintmax=1],,[#include <stdint.h>])
+ AC_CHECK_TYPE([intptr_t],[scm_stdint_has_intptr=1],,[#include <stdint.h>])
+ AC_CHECK_TYPE([uintptr_t],[scm_stdint_has_uintptr=1],,[#include <stdint.h>])
fi
# so we don't get confused by the cache (wish there was a better way
@@ -383,6 +385,8 @@ if test "$ac_cv_header_inttypes_h" = yes; then
AC_CHECK_TYPE([uint64_t],[scm_inttypes_has_uint64=1],,[#include
<inttypes.h>])
AC_CHECK_TYPE([intmax_t],[scm_inttypes_has_intmax=1],,[#include
<inttypes.h>])
AC_CHECK_TYPE([uintmax_t],[scm_inttypes_has_uintmax=1],,[#include
<inttypes.h>])
+ AC_CHECK_TYPE([intptr_t],[scm_inttypes_has_intptr=1],,[#include
<inttypes.h>])
+ AC_CHECK_TYPE([uintptr_t],[scm_inttypes_has_uintptr=1],,[#include
<inttypes.h>])
fi
# Try hard to find definitions for some required scm_t_*int* types.
@@ -575,6 +579,46 @@ else
fi
AC_SUBST([SCM_I_GSC_T_UINTMAX])
+### Required type scm_t_intptr
+###
+SCM_I_GSC_T_INTPTR=0
+if test "$scm_stdint_has_intptr"; then
+ SCM_I_GSC_T_INTPTR='"intptr_t"'
+ SCM_I_GSC_NEEDS_STDINT_H=1
+elif test "$scm_inttypes_has_intptr"; then
+ SCM_I_GSC_T_INTPTR='"intptr_t"'
+ SCM_I_GSC_NEEDS_INTTYPES_H=1
+elif test "$ac_cv_sizeof_int" = "$ac_cv_sizeof_void_p"; then
+ SCM_I_GSC_T_INTPTR='"int"'
+elif test "$ac_cv_sizeof_long" = "$ac_cv_sizeof_void_p"; then
+ SCM_I_GSC_T_INTPTR='"long"'
+elif test "$ac_cv_sizeof_long_long" = "$ac_cv_sizeof_void_p"; then
+ SCM_I_GSC_T_INTPTR='"long long"'
+else
+ AC_MSG_ERROR([Can't find appropriate type for `scm_t_intptr'.])
+fi
+AC_SUBST([SCM_I_GSC_T_INTPTR])
+
+### Required type scm_t_uintptr
+###
+SCM_I_GSC_T_UINTPTR=0
+if test "$scm_stdint_has_uintptr"; then
+ SCM_I_GSC_T_UINTPTR='"uintptr_t"'
+ SCM_I_GSC_NEEDS_STDINT_H=1
+elif test "$scm_inttypes_has_uintptr"; then
+ SCM_I_GSC_T_UINTPTR='"uintptr_t"'
+ SCM_I_GSC_NEEDS_INTTYPES_H=1
+elif test "$ac_cv_sizeof_int" = "$ac_cv_sizeof_void_p"; then
+ SCM_I_GSC_T_UINTPTR='"unsigned int"'
+elif test "$ac_cv_sizeof_long" = "$ac_cv_sizeof_void_p"; then
+ SCM_I_GSC_T_UINTPTR='"unsigned long"'
+elif test "$ac_cv_sizeof_long_long" = "$ac_cv_sizeof_void_p"; then
+ SCM_I_GSC_T_UINTPTR='"unsigned long long"'
+else
+ AC_MSG_ERROR([Can't find appropriate type for `scm_t_uintptr'.])
+fi
+AC_SUBST([SCM_I_GSC_T_UINTPTR])
+
AC_SUBST([SCM_I_GSC_NEEDS_STDINT_H])
AC_SUBST([SCM_I_GSC_NEEDS_INTTYPES_H])
@@ -637,7 +681,7 @@ AC_CHECK_TYPES(complex double,,,
# On MacOS X <sys/socklen.h> contains socklen_t, so must include that
# when testing.
AC_CHECK_TYPE(socklen_t, ,
- [AC_DEFINE_UNQUOTED(socklen_t, int,
+ [AC_DEFINE_UNQUOTED([socklen_t], int,
[Define to `int' if <sys/socket.h> does not define.])],
[#if HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -683,7 +727,7 @@ case $host in
fi
if test "$enable_shared" = yes ; then
EXTRA_DEFS="-DSCM_IMPORT"
- AC_DEFINE(USE_DLL_IMPORT, 1,
+ AC_DEFINE([USE_DLL_IMPORT], 1,
[Define if you need additional CPP macros on Win32 platforms.])
fi
;;
@@ -753,7 +797,7 @@ AC_CHECK_DECLS([sethostname, hstrerror, cuserid])
# libraries already in that list.
#
AC_SEARCH_LIBS(crypt, crypt,
- [AC_DEFINE(HAVE_CRYPT,1,
+ [AC_DEFINE([HAVE_CRYPT],1,
[Define to 1 if you have the `crypt' function.])])
# When compiling with GCC on some OSs (Solaris, AIX), _Complex_I doesn't
@@ -771,7 +815,7 @@ complex double z;
]], [[
z = _Complex_I;
]])],
- [AC_DEFINE(GUILE_I,_Complex_I,[The imaginary unit (positive square root of
-1).])
+ [AC_DEFINE([GUILE_I],_Complex_I,[The imaginary unit (positive square root
of -1).])
AC_MSG_RESULT([_Complex_I])],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#if HAVE_COMPLEX_H
@@ -781,7 +825,7 @@ complex double z;
]],[[
z = 1.0fi;
]])],
- [AC_DEFINE(GUILE_I,1.0fi)
+ [AC_DEFINE([GUILE_I],1.0fi)
AC_MSG_RESULT([1.0fi])],
[ac_cv_type_complex_double=no
AC_MSG_RESULT([not available])])])
@@ -814,7 +858,7 @@ main (void)
[guile_cv_use_csqrt="yes, hopefully (cross-compiling)"])])
case $guile_cv_use_csqrt in
yes*)
- AC_DEFINE(HAVE_USABLE_CSQRT, 1, [Define to 1 if csqrt is bug-free])
+ AC_DEFINE([HAVE_USABLE_CSQRT], 1, [Define to 1 if csqrt is bug-free])
;;
esac
fi
@@ -877,14 +921,14 @@ AC_CACHE_CHECK([return type of usleep],
guile_cv_func_usleep_return_type,
[guile_cv_func_usleep_return_type=int])])
case "$guile_cv_func_usleep_return_type" in
"void" )
- AC_DEFINE(USLEEP_RETURNS_VOID, 1,
+ AC_DEFINE([USLEEP_RETURNS_VOID], 1,
[Define if the system headers declare usleep to return void.])
;;
esac
AC_CHECK_HEADER(sys/un.h, have_sys_un_h=1)
if test -n "$have_sys_un_h" ; then
- AC_DEFINE(HAVE_UNIX_DOMAIN_SOCKETS, 1,
+ AC_DEFINE([HAVE_UNIX_DOMAIN_SOCKETS], 1,
[Define if the system supports Unix-domain (file-domain) sockets.])
fi
@@ -918,7 +962,7 @@ extern char *__libc_stack_end;]],
AC_MSG_RESULT($guile_cv_have_libc_stack_end)
if test $guile_cv_have_libc_stack_end = yes; then
- AC_DEFINE(HAVE_LIBC_STACK_END, 1,
+ AC_DEFINE([HAVE_LIBC_STACK_END], 1,
[Define if you have the __libc_stack_end variable.])
fi
@@ -933,7 +977,7 @@ AC_CACHE_VAL(guile_cv_have_h_errno,
[guile_cv_have_h_errno=no])])
AC_MSG_RESULT($guile_cv_have_h_errno)
if test $guile_cv_have_h_errno = yes; then
- AC_DEFINE(HAVE_H_ERRNO, 1, [Define if h_errno is declared in netdb.h.])
+ AC_DEFINE([HAVE_H_ERRNO], 1, [Define if h_errno is declared in netdb.h.])
fi
AC_MSG_CHECKING(whether uint32_t is defined)
@@ -950,7 +994,7 @@ AC_CACHE_VAL(guile_cv_have_uint32_t,
[guile_cv_have_uint32_t=no])])
AC_MSG_RESULT($guile_cv_have_uint32_t)
if test $guile_cv_have_uint32_t = yes; then
- AC_DEFINE(HAVE_UINT32_T, 1,
+ AC_DEFINE([HAVE_UINT32_T], 1,
[Define if uint32_t typedef is defined when netdb.h is include.])
fi
@@ -967,7 +1011,7 @@ AC_CACHE_VAL(guile_cv_have_ipv6,
[guile_cv_have_ipv6=no])])
AC_MSG_RESULT($guile_cv_have_ipv6)
if test $guile_cv_have_ipv6 = yes; then
- AC_DEFINE(HAVE_IPV6, 1, [Define if you want support for IPv6.])
+ AC_DEFINE([HAVE_IPV6], 1, [Define if you want support for IPv6.])
fi
# included in rfc2553 but not in older implementations, e.g., glibc 2.1.3.
@@ -983,7 +1027,7 @@ AC_CACHE_VAL(guile_cv_have_sin6_scope_id,
[guile_cv_have_sin6_scope_id=no])])
AC_MSG_RESULT($guile_cv_have_sin6_scope_id)
if test $guile_cv_have_sin6_scope_id = yes; then
- AC_DEFINE(HAVE_SIN6_SCOPE_ID, 1,
+ AC_DEFINE([HAVE_SIN6_SCOPE_ID], 1,
[Define this if your IPv6 has sin6_scope_id in sockaddr_in6 struct.])
fi
@@ -1040,7 +1084,7 @@ else
fi])dnl
AC_MSG_RESULT($guile_cv_localtime_cache)
if test $guile_cv_localtime_cache = yes; then
- AC_DEFINE(LOCALTIME_CACHE, 1, [Define if localtime caches the TZ setting.])
+ AC_DEFINE([LOCALTIME_CACHE], 1, [Define if localtime caches the TZ setting.])
fi
if test "$enable_regex" = yes; then
@@ -1058,7 +1102,7 @@ if test "$enable_regex" = yes; then
if test "$ac_cv_func_regcomp_norx" = yes ||
test "$ac_cv_func_regcomp_regex" = yes ||
test "$ac_cv_func_regcomp_rx" = yes; then
- AC_DEFINE(HAVE_REGCOMP, 1,
+ AC_DEFINE([HAVE_REGCOMP], 1,
[This is included as part of a workaround for a autoheader bug.])
fi
fi
@@ -1090,7 +1134,7 @@ AC_LINK_IFELSE(AC_LANG_SOURCE(
volatile double x = 0.0;
int main () { return (isinf(x) != 0); }]]),
[AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_ISINF, 1,
+ AC_DEFINE([HAVE_ISINF], 1,
[Define to 1 if you have the `isinf' macro or function.])],
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([for isnan])
@@ -1099,7 +1143,7 @@ AC_LINK_IFELSE(AC_LANG_SOURCE(
volatile double x = 0.0;
int main () { return (isnan(x) != 0); }]]),
[AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_ISNAN, 1,
+ AC_DEFINE([HAVE_ISNAN], 1,
[Define to 1 if you have the `isnan' macro or function.])],
[AC_MSG_RESULT([no])])
@@ -1201,7 +1245,7 @@ AC_CHECK_TYPE([GC_fn_type],
AC_CHECK_SIZEOF(float)
if test "$ac_cv_sizeof_float" -le "$ac_cv_sizeof_long"; then
- AC_DEFINE(SCM_SINGLES, 1,
+ AC_DEFINE([SCM_SINGLES], 1,
[Define this if floats are the same size as longs.])
fi
@@ -1215,7 +1259,7 @@ AC_CACHE_VAL(scm_cv_struct_linger,
[scm_cv_struct_linger="no"]))
AC_MSG_RESULT($scm_cv_struct_linger)
if test $scm_cv_struct_linger = yes; then
- AC_DEFINE(HAVE_STRUCT_LINGER, 1,
+ AC_DEFINE([HAVE_STRUCT_LINGER], 1,
[Define this if your system defines struct linger, for use with the
getsockopt and setsockopt system calls.])
fi
@@ -1234,7 +1278,7 @@ AC_CACHE_VAL(scm_cv_struct_timespec,
[scm_cv_struct_timespec="no"]))
AC_MSG_RESULT($scm_cv_struct_timespec)
if test $scm_cv_struct_timespec = yes; then
- AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1,
+ AC_DEFINE([HAVE_STRUCT_TIMESPEC], 1,
[Define this if your system defines struct timespec via either <time.h> or
<pthread.h>.])
fi
@@ -1331,6 +1375,7 @@ case "$with_threads" in
;;
"no" | "null")
SCM_I_GSC_USE_NULL_THREADS=1
+ SCM_I_GSC_HAVE_THREAD_STORAGE_CLASS=0
with_threads="null-threads"
;;
* )
@@ -1379,7 +1424,7 @@ int main ()
#endif
]])],
[works=yes
-AC_DEFINE(PTHREAD_ATTR_GETSTACK_WORKS, [1], [Define when pthread_att_get_stack
works for the main thread])],
+AC_DEFINE([PTHREAD_ATTR_GETSTACK_WORKS], [1], [Define when
pthread_att_get_stack works for the main thread])],
[works=no],
[])
CFLAGS="$old_CFLAGS"
diff --git a/doc/ref/misc-modules.texi b/doc/ref/misc-modules.texi
index db90c41..35fe564 100644
--- a/doc/ref/misc-modules.texi
+++ b/doc/ref/misc-modules.texi
@@ -1038,7 +1038,7 @@ Reference Manual}).
@sp 1
@defun ftw startname proc ['hash-size n]
-Walk the filesystem tree descending from @var{startname}, calling
+Walk the file system tree descending from @var{startname}, calling
@var{proc} for each file and directory.
Hard links and symbolic links are followed. A file or directory is
@@ -1094,7 +1094,7 @@ use @code{throw} or similar to escape.
@defun nftw startname proc ['chdir] ['depth] ['hash-size n] ['mount]
['physical]
-Walk the filesystem tree starting at @var{startname}, calling
+Walk the file system tree starting at @var{startname}, calling
@var{proc} for each file and directory. @code{nftw} has extra
features over the basic @code{ftw} described above.
@@ -1177,7 +1177,7 @@ Set the size of the hash table used to track items
already visited.
@item @code{mount}
Don't cross a mount point, meaning only visit items on the same
-filesystem as @var{startname} (ie.@: the same @code{stat:dev}).
+file system as @var{startname} (ie.@: the same @code{stat:dev}).
@item @code{physical}
Don't follow symbolic links, instead report them to @var{proc} as
diff --git a/doc/sources/unix.texi b/doc/sources/unix.texi
index e8a189c..0ef894a 100644
--- a/doc/sources/unix.texi
+++ b/doc/sources/unix.texi
@@ -12,7 +12,7 @@ be required to make them available.
* Ports and descriptors:: Ports, file descriptors and how they
interact.
* Extended I/O:: Reading and writing to ports.
-* File system:: Working in a hierarchical filesystem.
+* File system:: Working in a hierarchical file system.
* User database:: Information about users from system databases.
* Processes:: Information and control of Unix processes.
* Terminals:: Terminals and pseudo-terminals.
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 5de528a..99a0a90 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -38,8 +38,8 @@ EXTRA_DIST = README ChangeLog-2008 check.test
\
\
safe/README safe/safe safe/untrusted.scm safe/evil.scm
-AM_CFLAGS = `PATH=$(bindir):$$PATH PKG_CONFIG_PATH=$(libdir)/pkgconfig
$(bindir)/guile-config compile`
-AM_LIBS = `PATH=$(bindir):$$PATH PKG_CONFIG_PATH=$(libdir)/pkgconfig
$(bindir)/guile-config link`
+AM_CFLAGS = `PATH=$(bindir)$(PATH_SEPARATOR)$$PATH
PKG_CONFIG_PATH=$(libdir)/pkgconfig $(bindir)/guile-config compile`
+AM_LIBS = `PATH=$(bindir)$(PATH_SEPARATOR)$$PATH
PKG_CONFIG_PATH=$(libdir)/pkgconfig $(bindir)/guile-config link`
box/box: box/box.o
@@ -77,10 +77,10 @@ box-dynamic-module/box.lo: box-dynamic-module/box.c
installcheck: box/box box-module/box libbox.la libbox-module.la
- LD_LIBRARY_PATH="$(libdir):$$LD_LIBRARY_PATH" \
- LTDL_LIBRARY_PATH="$(builddir):$$LTDL_LIBRARY_PATH" \
- GUILE_LOAD_PATH="$(abs_top_srcdir):$$GUILE_LOAD_PATH" \
- PATH="$(bindir):$$PATH" \
+ LD_LIBRARY_PATH="$(libdir)$(PATH_SEPARATOR)$$LD_LIBRARY_PATH"
\
+ LTDL_LIBRARY_PATH="$(builddir)$(PATH_SEPARATOR)$$LTDL_LIBRARY_PATH"
\
+ GUILE_LOAD_PATH="$(abs_top_srcdir)$(PATH_SEPARATOR)$$GUILE_LOAD_PATH"
\
+ PATH="$(bindir)$(PATH_SEPARATOR)$$PATH" \
GUILE_AUTO_COMPILE=0 \
srcdir="$(srcdir)" \
$(srcdir)/check.test
diff --git a/examples/compat/acinclude.m4 b/examples/compat/acinclude.m4
index 9560e0b..93c1925 100644
--- a/examples/compat/acinclude.m4
+++ b/examples/compat/acinclude.m4
@@ -12,7 +12,7 @@ AC_DEFUN([GUILE_COMPAT],
ac_cv_have_scm_t_bits=no)])
AC_MSG_RESULT($ac_cv_have_scm_t_bits)
if test $ac_cv_have_scm_t_bits = yes; then
- AC_DEFINE(HAVE_SCM_T_BITS)
+ AC_DEFINE([HAVE_SCM_T_BITS])
fi
LIBS="$guile_compat_save_LIBS"
CFLAGS="$guile_compat_save_CFLAGS"])
diff --git a/lib/duplocale.c b/lib/duplocale.c
index e7618b8..1077abe 100644
--- a/lib/duplocale.c
+++ b/lib/duplocale.c
@@ -22,15 +22,8 @@
#include <locale.h>
#include <errno.h>
-#include <langinfo.h>
#include <string.h>
-/* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
- glibc < 2.12.
- See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
-#undef _NL_LOCALE_NAME
-#define _NL_LOCALE_NAME(category) _NL_ITEM ((category), _NL_ITEM_INDEX (-1))
-
#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
#undef duplocale
@@ -74,11 +67,7 @@ rpl_duplocale (locale_t locale)
locale_t base_copy;
unsigned int i;
- base_name = nl_langinfo (_NL_LOCALE_NAME (LC_CTYPE));
- if (base_name[0] == '\0')
- /* Fallback code for glibc < 2.4, which did not implement
- nl_langinfo (_NL_LOCALE_NAME (category)). */
- base_name = setlocale (LC_CTYPE, NULL);
+ base_name = setlocale (LC_CTYPE, NULL);
base_copy = newlocale (LC_ALL_MASK, base_name, NULL);
if (base_copy == NULL)
return NULL;
@@ -87,11 +76,7 @@ rpl_duplocale (locale_t locale)
{
int category = categories[i].cat;
int category_mask = categories[i].mask;
- const char *name = nl_langinfo (_NL_LOCALE_NAME (category));
- if (name[0] == '\0')
- /* Fallback code for glibc < 2.4, which did not implement
- nl_langinfo (_NL_LOCALE_NAME (category)). */
- name = setlocale (category, NULL);
+ const char *name = setlocale (category, NULL);
if (strcmp (name, base_name) != 0)
{
locale_t copy = newlocale (category_mask, name, base_copy);
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 80a6245..cab55da 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -420,7 +420,7 @@ noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c
\
srfi-4.i.c srfi-14.i.c \
quicksort.i.c \
win32-uname.h win32-dirent.h win32-socket.h \
- private-gc.h private-options.h
+ private-gc.h private-options.h
# vm instructions
noinst_HEADERS += vm-engine.c vm-i-system.c vm-i-scheme.c vm-i-loader.c
diff --git a/libguile/__scm.h b/libguile/__scm.h
index c6cbe3f..b4e1bd9 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -134,19 +134,6 @@
/* #define GUILE_DEBUG_FREELIST */
-/* All the number support there is.
- */
-#define BIGNUMS
-
-/* GC should relinquish empty cons-pair arenas. */
-/* cmm:FIXME look at this after done mangling the GC */
-/* #define GC_FREE_SEGMENTS */
-
-/* Provide a scheme-accessible count-down timer that
- * generates a pseudo-interrupt.
- */
-#define TICKS
-
/* Use engineering notation when converting numbers strings?
*/
@@ -410,6 +397,10 @@
#define SCM_T_INTMAX_MIN SCM_I_TYPE_MIN(scm_t_intmax,SCM_T_UINTMAX_MAX)
#define SCM_T_INTMAX_MAX SCM_I_TYPE_MAX(scm_t_intmax,SCM_T_UINTMAX_MAX)
+#define SCM_T_UINTPTR_MAX SCM_I_UTYPE_MAX(scm_t_uintptr)
+#define SCM_T_INTPTR_MIN SCM_I_TYPE_MIN(scm_t_intptr,SCM_T_UINTPTR_MAX)
+#define SCM_T_INTPTR_MAX SCM_I_TYPE_MAX(scm_t_intptr,SCM_T_UINTPTR_MAX)
+
#define SCM_I_SIZE_MAX SCM_I_UTYPE_MAX(size_t)
#define SCM_I_SSIZE_MIN SCM_I_TYPE_MIN(ssize_t,SCM_I_SIZE_MAX)
#define SCM_I_SSIZE_MAX SCM_I_TYPE_MAX(ssize_t,SCM_I_SIZE_MAX)
diff --git a/libguile/_scm.h b/libguile/_scm.h
index 6cb7ce8..810b656 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -39,6 +39,9 @@
# include <config.h>
#endif
+/* The size of `scm_t_bits'. */
+#define SIZEOF_SCM_T_BITS SIZEOF_VOID_P
+
/* Undefine HAVE_STRUCT_TIMESPEC, because the libguile C code doesn't
need it anymore, and because on MinGW:
diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c
index f9fff6e..cf5f6c7 100644
--- a/libguile/gen-scmconfig.c
+++ b/libguile/gen-scmconfig.c
@@ -290,6 +290,8 @@ main (int argc, char *argv[])
pf ("typedef %s scm_t_uint32;\n", SCM_I_GSC_T_UINT32);
pf ("typedef %s scm_t_intmax;\n", SCM_I_GSC_T_INTMAX);
pf ("typedef %s scm_t_uintmax;\n", SCM_I_GSC_T_UINTMAX);
+ pf ("typedef %s scm_t_intptr;\n", SCM_I_GSC_T_INTPTR);
+ pf ("typedef %s scm_t_uintptr;\n", SCM_I_GSC_T_UINTPTR);
if (0 == strcmp ("intmax_t", SCM_I_GSC_T_INTMAX))
pf ("#define SCM_SIZEOF_INTMAX %d\n", SIZEOF_INTMAX_T);
diff --git a/libguile/gen-scmconfig.h.in b/libguile/gen-scmconfig.h.in
index 770e081..5d569f6 100644
--- a/libguile/gen-scmconfig.h.in
+++ b/libguile/gen-scmconfig.h.in
@@ -25,6 +25,8 @@
#define SCM_I_GSC_T_UINT64 @SCM_I_GSC_T_UINT64@
#define SCM_I_GSC_T_INTMAX @SCM_I_GSC_T_INTMAX@
#define SCM_I_GSC_T_UINTMAX @SCM_I_GSC_T_UINTMAX@
+#define SCM_I_GSC_T_INTPTR @SCM_I_GSC_T_INTPTR@
+#define SCM_I_GSC_T_UINTPTR @SCM_I_GSC_T_UINTPTR@
#define SCM_I_GSC_T_PTRDIFF @SCM_I_GSC_T_PTRDIFF@
#define SCM_I_GSC_USE_PTHREAD_THREADS @SCM_I_GSC_USE_PTHREAD_THREADS@
#define SCM_I_GSC_USE_NULL_THREADS @SCM_I_GSC_USE_NULL_THREADS@
diff --git a/libguile/tags.h b/libguile/tags.h
index c8cd621..79f7093 100644
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -31,17 +31,6 @@
/* picks up scmconfig.h too */
#include "libguile/__scm.h"
-/* FIXME: We shouldn't rely on `HAVE_*' macros here since it's a public
- header. */
-
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h> /* for INTPTR_MAX and friends */
-#else
-# ifdef HAVE_STDINT_H
-# include <stdint.h> /* for INTPTR_MAX and friends */
-# endif
-#endif
-
/* In the beginning was the Word:
@@ -72,31 +61,14 @@
/* For dealing with the bit level representation of scheme objects we define
* scm_t_bits:
*/
-/* On Solaris 7 and 8, /usr/include/sys/int_limits.h defines
- INTPTR_MAX and UINTPTR_MAX to empty, INTPTR_MIN is not defined.
- To avoid uintptr_t and intptr_t in this case we require
- UINTPTR_MAX-0 != 0 etc. */
-#if SCM_SIZEOF_INTPTR_T != 0 && defined(INTPTR_MAX) && defined(INTPTR_MIN) \
- && INTPTR_MAX-0 != 0 && INTPTR_MIN-0 != 0 \
- && SCM_SIZEOF_UINTPTR_T != 0 && defined(UINTPTR_MAX) && UINTPTR_MAX-0 != 0
-
-typedef intptr_t scm_t_signed_bits;
-#define SCM_T_SIGNED_BITS_MAX INTPTR_MAX
-#define SCM_T_SIGNED_BITS_MIN INTPTR_MIN
-typedef uintptr_t scm_t_bits;
-#define SIZEOF_SCM_T_BITS SCM_SIZEOF_UINTPTR_T
-#define SCM_T_BITS_MAX UINTPTR_MAX
-#else
+typedef scm_t_intptr scm_t_signed_bits;
+typedef scm_t_uintptr scm_t_bits;
-typedef signed long scm_t_signed_bits;
-#define SCM_T_SIGNED_BITS_MAX LONG_MAX
-#define SCM_T_SIGNED_BITS_MIN LONG_MIN
-typedef unsigned long scm_t_bits;
-#define SIZEOF_SCM_T_BITS SCM_SIZEOF_UNSIGNED_LONG
-#define SCM_T_BITS_MAX ULONG_MAX
+#define SCM_T_SIGNED_BITS_MAX SCM_T_INTPTR_MAX
+#define SCM_T_SIGNED_BITS_MIN SCM_T_INTPTR_MIN
+#define SCM_T_BITS_MAX SCM_T_UINTPTR_MAX
-#endif
/* But as external interface, we define SCM, which may, according to the
* desired level of type checking, be defined in several ways:
diff --git a/meta/Makefile.am b/meta/Makefile.am
index dbcf9da..ad269ba 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -38,8 +38,8 @@ guile-config: $(srcdir)/guile-config.in
guile="@bindir@/`echo guile | $(SED) -e '$(program_transform_name)'`" ;
\
cat $(srcdir)/guile-config.in
\
| $(SED) -e "s,@pkgconfigdir@,$(pkgconfigdir),g ;
\
- s,@""PKG_CONFIG@,$(PKG_CONFIG),g ;
\
- s,@installed_guile@,$$guile,g"
\
+ s,@""PKG_CONFIG@,$(PKG_CONFIG),g ;
\
+ s,@installed_guile@,$$guile,g"
\
> guile-config.out
mv guile-config.out guile-config
chmod +x guile-config
diff --git a/module/ice-9/ftw.scm b/module/ice-9/ftw.scm
index ce2fb16..e6ac0b4 100644
--- a/module/ice-9/ftw.scm
+++ b/module/ice-9/ftw.scm
@@ -1,4 +1,4 @@
-;;;; ftw.scm --- filesystem tree walk
+;;;; ftw.scm --- file system tree walk
;;;; Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
;;;;
@@ -104,7 +104,7 @@
;; entered directory.
;;
;; * Procedure: (ftw filename proc . options)
-;; Do a filesystem tree walk starting at FILENAME using PROC.
+;; Do a file system tree walk starting at FILENAME using PROC.
;;
;; The `ftw' procedure calls the callback procedure given in the
;; parameter PROC for every item which is found in the directory
@@ -140,7 +140,7 @@
;; returned as the return value of `ftw'.
;;
;; * Procedure: (nftw filename proc . control-flags)
-;; Do a new-style filesystem tree walk starting at FILENAME using PROC.
+;; Do a new-style file system tree walk starting at FILENAME using PROC.
;; Various optional CONTROL-FLAGS alter the default behavior.
;;
;; The `nftw' procedures works like the `ftw' procedures. It calls
@@ -165,7 +165,7 @@
;;
;; mount'
;; The callback procedure is only called for items which are on
-;; the same mounted filesystem as the directory given as the
+;; the same mounted file system as the directory given as the
;; FILENAME parameter to `nftw'.
;;
;; chdir'
hooks/post-receive
--
GNU Guile
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, master, updated. release_1-9-5-19-ga7348a4,
Ludovic Courtès <=