mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-12 23:00:22 +02:00
* srfi-4.c, strings.c: Replace SCM_C_INLINE with SCM_C_INLINE_KEYWORD.
Thanks to Mark Gran!
This commit is contained in:
parent
76c3e43cda
commit
57e1b34a17
3 changed files with 18 additions and 13 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2006-05-27 Marius Vollmer <mvo@zagadka.de>
|
||||||
|
|
||||||
|
* srfi-4.c, strings.c: Replace SCM_C_INLINE with
|
||||||
|
SCM_C_INLINE_KEYWORD. Thanks to Mark Gran!
|
||||||
|
|
||||||
2006-05-26 Kevin Ryde <user42@zip.com.au>
|
2006-05-26 Kevin Ryde <user42@zip.com.au>
|
||||||
|
|
||||||
* fports.c (fport_input_waiting): For ioctl, check HAVE_IOCTL as well
|
* fports.c (fport_input_waiting): For ioctl, check HAVE_IOCTL as well
|
||||||
|
|
|
@ -277,7 +277,7 @@ uvec_free (SCM uvec)
|
||||||
/* Utility procedures. */
|
/* Utility procedures. */
|
||||||
/* ================================================================ */
|
/* ================================================================ */
|
||||||
|
|
||||||
static SCM_C_INLINE int
|
static SCM_C_INLINE_KEYOWRD int
|
||||||
is_uvec (int type, SCM obj)
|
is_uvec (int type, SCM obj)
|
||||||
{
|
{
|
||||||
if (SCM_IS_UVEC (obj))
|
if (SCM_IS_UVEC (obj))
|
||||||
|
@ -290,13 +290,13 @@ is_uvec (int type, SCM obj)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SCM_C_INLINE SCM
|
static SCM_C_INLINE_KEYOWRD SCM
|
||||||
uvec_p (int type, SCM obj)
|
uvec_p (int type, SCM obj)
|
||||||
{
|
{
|
||||||
return scm_from_bool (is_uvec (type, obj));
|
return scm_from_bool (is_uvec (type, obj));
|
||||||
}
|
}
|
||||||
|
|
||||||
static SCM_C_INLINE void
|
static SCM_C_INLINE_KEYOWRD void
|
||||||
uvec_assert (int type, SCM obj)
|
uvec_assert (int type, SCM obj)
|
||||||
{
|
{
|
||||||
if (!is_uvec (type, obj))
|
if (!is_uvec (type, obj))
|
||||||
|
@ -334,7 +334,7 @@ alloc_uvec (int type, size_t len)
|
||||||
so we use a big 'if' in the next two functions.
|
so we use a big 'if' in the next two functions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static SCM_C_INLINE SCM
|
static SCM_C_INLINE_KEYOWRD SCM
|
||||||
uvec_fast_ref (int type, const void *base, size_t c_idx)
|
uvec_fast_ref (int type, const void *base, size_t c_idx)
|
||||||
{
|
{
|
||||||
if (type == SCM_UVEC_U8)
|
if (type == SCM_UVEC_U8)
|
||||||
|
@ -390,7 +390,7 @@ assert_exact_integer_range (SCM val, SCM min, SCM max)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static SCM_C_INLINE void
|
static SCM_C_INLINE_KEYOWRD void
|
||||||
uvec_fast_set_x (int type, void *base, size_t c_idx, SCM val)
|
uvec_fast_set_x (int type, void *base, size_t c_idx, SCM val)
|
||||||
{
|
{
|
||||||
if (type == SCM_UVEC_U8)
|
if (type == SCM_UVEC_U8)
|
||||||
|
@ -438,7 +438,7 @@ uvec_fast_set_x (int type, void *base, size_t c_idx, SCM val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static SCM_C_INLINE SCM
|
static SCM_C_INLINE_KEYOWRD SCM
|
||||||
make_uvec (int type, SCM len, SCM fill)
|
make_uvec (int type, SCM len, SCM fill)
|
||||||
{
|
{
|
||||||
size_t c_len = scm_to_size_t (len);
|
size_t c_len = scm_to_size_t (len);
|
||||||
|
@ -453,7 +453,7 @@ make_uvec (int type, SCM len, SCM fill)
|
||||||
return uvec;
|
return uvec;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SCM_C_INLINE void *
|
static SCM_C_INLINE_KEYOWRD void *
|
||||||
uvec_writable_elements (int type, SCM uvec, scm_t_array_handle *handle,
|
uvec_writable_elements (int type, SCM uvec, scm_t_array_handle *handle,
|
||||||
size_t *lenp, ssize_t *incp)
|
size_t *lenp, ssize_t *incp)
|
||||||
{
|
{
|
||||||
|
@ -468,7 +468,7 @@ uvec_writable_elements (int type, SCM uvec, scm_t_array_handle *handle,
|
||||||
return scm_uniform_vector_writable_elements (uvec, handle, lenp, incp);
|
return scm_uniform_vector_writable_elements (uvec, handle, lenp, incp);
|
||||||
}
|
}
|
||||||
|
|
||||||
static SCM_C_INLINE const void *
|
static SCM_C_INLINE_KEYOWRD const void *
|
||||||
uvec_elements (int type, SCM uvec, scm_t_array_handle *handle,
|
uvec_elements (int type, SCM uvec, scm_t_array_handle *handle,
|
||||||
size_t *lenp, ssize_t *incp)
|
size_t *lenp, ssize_t *incp)
|
||||||
{
|
{
|
||||||
|
@ -503,7 +503,7 @@ uvec_to_list (int type, SCM uvec)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SCM_C_INLINE SCM
|
static SCM_C_INLINE_KEYOWRD SCM
|
||||||
uvec_length (int type, SCM uvec)
|
uvec_length (int type, SCM uvec)
|
||||||
{
|
{
|
||||||
scm_t_array_handle handle;
|
scm_t_array_handle handle;
|
||||||
|
@ -514,7 +514,7 @@ uvec_length (int type, SCM uvec)
|
||||||
return scm_from_size_t (len);
|
return scm_from_size_t (len);
|
||||||
}
|
}
|
||||||
|
|
||||||
static SCM_C_INLINE SCM
|
static SCM_C_INLINE_KEYOWRD SCM
|
||||||
uvec_ref (int type, SCM uvec, SCM idx)
|
uvec_ref (int type, SCM uvec, SCM idx)
|
||||||
{
|
{
|
||||||
scm_t_array_handle handle;
|
scm_t_array_handle handle;
|
||||||
|
@ -532,7 +532,7 @@ uvec_ref (int type, SCM uvec, SCM idx)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SCM_C_INLINE SCM
|
static SCM_C_INLINE_KEYOWRD SCM
|
||||||
uvec_set_x (int type, SCM uvec, SCM idx, SCM val)
|
uvec_set_x (int type, SCM uvec, SCM idx, SCM val)
|
||||||
{
|
{
|
||||||
scm_t_array_handle handle;
|
scm_t_array_handle handle;
|
||||||
|
@ -549,7 +549,7 @@ uvec_set_x (int type, SCM uvec, SCM idx, SCM val)
|
||||||
return SCM_UNSPECIFIED;
|
return SCM_UNSPECIFIED;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SCM_C_INLINE SCM
|
static SCM_C_INLINE_KEYOWRD SCM
|
||||||
list_to_uvec (int type, SCM list)
|
list_to_uvec (int type, SCM list)
|
||||||
{
|
{
|
||||||
SCM uvec;
|
SCM uvec;
|
||||||
|
|
|
@ -124,7 +124,7 @@ make_stringbuf (size_t len)
|
||||||
|
|
||||||
/* Return a new stringbuf whose underlying storage consists of the LEN+1
|
/* Return a new stringbuf whose underlying storage consists of the LEN+1
|
||||||
octets pointed to by STR (the last octet is zero). */
|
octets pointed to by STR (the last octet is zero). */
|
||||||
SCM_C_INLINE SCM
|
SCM_C_INLINE_KEYWORD SCM
|
||||||
scm_i_take_stringbufn (char *str, size_t len)
|
scm_i_take_stringbufn (char *str, size_t len)
|
||||||
{
|
{
|
||||||
scm_gc_register_collectable_memory (str, len + 1, "stringbuf");
|
scm_gc_register_collectable_memory (str, len + 1, "stringbuf");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue