summaryrefslogtreecommitdiff
path: root/libguile
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-03-07 22:50:44 +0100
committerLudovic Courtès <ludo@gnu.org>2012-03-07 22:50:44 +0100
commitc336514976ed3f2b2b20c56149ede7f5ec549c52 (patch)
treea6d7a9e4730cbf3da503c3668672a3167ce06772 /libguile
parent283ab48d3f20a5c5281cafc29f0c30c8d8ace9ee (diff)
downloadguile-c336514976ed3f2b2b20c56149ede7f5ec549c52.tar.gz
Change `scm_words' to accept a 32-bit word number.
Fixes <http://bugs.gnu.org/10914>. Reported by Tobias Brandt <tob.brandt@googlemail.com>. * libguile/gc.h (scm_words): Change `n_words' to be `scm_t_uint32'. * libguile/inline.h: Update extraneous declaration.
Diffstat (limited to 'libguile')
-rw-r--r--libguile/gc.h7
-rw-r--r--libguile/inline.h4
2 files changed, 6 insertions, 5 deletions
diff --git a/libguile/gc.h b/libguile/gc.h
index af00e1ed1..b1df82df5 100644
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -3,7 +3,8 @@
#ifndef SCM_GC_H
#define SCM_GC_H
-/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006,
+ * 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -194,7 +195,7 @@ SCM_API char *scm_gc_strndup (const char *str, size_t n, const char *what)
SCM_INLINE SCM scm_cell (scm_t_bits car, scm_t_bits cdr);
SCM_INLINE SCM scm_double_cell (scm_t_bits car, scm_t_bits cbr,
scm_t_bits ccr, scm_t_bits cdr);
-SCM_INLINE SCM scm_words (scm_t_bits car, scm_t_uint16 n_words);
+SCM_INLINE SCM scm_words (scm_t_bits car, scm_t_uint32 n_words);
#if SCM_CAN_INLINE || defined SCM_INLINE_C_IMPLEMENTING_INLINES
@@ -254,7 +255,7 @@ scm_double_cell (scm_t_bits car, scm_t_bits cbr,
}
SCM_INLINE_IMPLEMENTATION SCM
-scm_words (scm_t_bits car, scm_t_uint16 n_words)
+scm_words (scm_t_bits car, scm_t_uint32 n_words)
{
SCM z;
diff --git a/libguile/inline.h b/libguile/inline.h
index fe9cac70f..618890d36 100644
--- a/libguile/inline.h
+++ b/libguile/inline.h
@@ -4,7 +4,7 @@
#define SCM_INLINE_H
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010,
- * 2011 Free Software Foundation, Inc.
+ * 2011, 2012 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -47,7 +47,7 @@ SCM_INLINE int scm_is_string (SCM x);
SCM_INLINE SCM scm_cell (scm_t_bits car, scm_t_bits cdr);
SCM_INLINE SCM scm_double_cell (scm_t_bits car, scm_t_bits cbr,
scm_t_bits ccr, scm_t_bits cdr);
-SCM_INLINE SCM scm_words (scm_t_bits car, scm_t_uint16 n_words);
+SCM_INLINE SCM scm_words (scm_t_bits car, scm_t_uint32 n_words);
#if SCM_CAN_INLINE || defined SCM_INLINE_C_IMPLEMENTING_INLINES
/* Either inlining, or being included from inline.c. */