1.8.0: SCM_C_INLINE used instead of SCM_C_INLINE_KEYWORD

[Mike Gran]

In libguile/srfi-4.c and libguile/strings.c, the SCM_C_INLINE_KEYWORD
needs to be used instead of SCM_C_INLINE for compilers w/o an inline
keyword.

*** strings.c   Mon Feb 27 17:20:47 2006
--- strings.c.0 Mon Feb 27 17:18:33 2006
***************
*** 124,130 ****
  
  /* Return a new stringbuf whose underlying storage consists of the
LEN+1
     octets pointed to by STR (the last octet is zero).  */
! SCM_C_INLINE_KEYWORD SCM
  scm_i_take_stringbufn (char *str, size_t len)
  {
    scm_gc_register_collectable_memory (str, len + 1, "stringbuf");
--- 124,130 ----
  
  /* Return a new stringbuf whose underlying storage consists of the
LEN+1
     octets pointed to by STR (the last octet is zero).  */
! SCM_C_INLINE SCM
  scm_i_take_stringbufn (char *str, size_t len)
  {
    scm_gc_register_collectable_memory (str, len + 1, "stringbuf");


*** srfi-4.c    Mon Feb 27 17:23:15 2006
--- srfi-4.c.0  Mon Feb 27 17:21:58 2006
***************
*** 277,283 ****
  /* Utility procedures.                                             
*/
  /* ================================================================
*/
  
! static SCM_C_INLINE_KEYWORD int
  is_uvec (int type, SCM obj)
  {
    if (SCM_IS_UVEC (obj))
--- 277,283 ----
  /* Utility procedures.                                             
*/
  /* ================================================================
*/
  
! static SCM_C_INLINE int
  is_uvec (int type, SCM obj)
  {
    if (SCM_IS_UVEC (obj))
***************
*** 290,302 ****
    return 0;
  }
  
! static SCM_C_INLINE_KEYWORD SCM
  uvec_p (int type, SCM obj)
  {
    return scm_from_bool (is_uvec (type, obj));
  }
  
! static SCM_C_INLINE_KEYWORD void
  uvec_assert (int type, SCM obj)
  {
    if (!is_uvec (type, obj))
--- 290,302 ----
    return 0;
  }
  
! static SCM_C_INLINE SCM
  uvec_p (int type, SCM obj)
  {
    return scm_from_bool (is_uvec (type, obj));
  }
  
! static SCM_C_INLINE void
  uvec_assert (int type, SCM obj)
  {
    if (!is_uvec (type, obj))
***************
*** 334,340 ****
     so we use a big 'if' in the next two functions.
  */
  
! static SCM_C_INLINE_KEYWORD SCM
  uvec_fast_ref (int type, const void *base, size_t c_idx)
  {
    if (type == SCM_UVEC_U8)
--- 334,340 ----
     so we use a big 'if' in the next two functions.
  */
  
! static SCM_C_INLINE SCM
  uvec_fast_ref (int type, const void *base, size_t c_idx)
  {
    if (type == SCM_UVEC_U8)
***************
*** 390,396 ****
  }
  #endif
  
! static SCM_C_INLINE_KEYWORD void
  uvec_fast_set_x (int type, void *base, size_t c_idx, SCM val)
  {
    if (type == SCM_UVEC_U8)
--- 390,396 ----
  }
  #endif
  
! static SCM_C_INLINE void
  uvec_fast_set_x (int type, void *base, size_t c_idx, SCM val)
  {
    if (type == SCM_UVEC_U8)
***************
*** 438,444 ****
      }
  }
  
! static SCM_C_INLINE_KEYWORD SCM
  make_uvec (int type, SCM len, SCM fill)
  {
    size_t c_len = scm_to_size_t (len);
--- 438,444 ----
      }
  }
  
! static SCM_C_INLINE SCM
  make_uvec (int type, SCM len, SCM fill)
  {
    size_t c_len = scm_to_size_t (len);
***************
*** 453,459 ****
    return uvec;
  }
  
! static SCM_C_INLINE_KEYWORD void *
  uvec_writable_elements (int type, SCM uvec, scm_t_array_handle
*handle,
                        size_t *lenp, ssize_t *incp)
  {
--- 453,459 ----
    return uvec;
  }
  
! static SCM_C_INLINE void *
  uvec_writable_elements (int type, SCM uvec, scm_t_array_handle
*handle,
                        size_t *lenp, ssize_t *incp)
  {
***************
*** 468,474 ****
    return scm_uniform_vector_writable_elements (uvec, handle, lenp,
incp);
  }
  
! static SCM_C_INLINE_KEYWORD const void *
  uvec_elements (int type, SCM uvec, scm_t_array_handle *handle,
               size_t *lenp, ssize_t *incp)
  {
--- 468,474 ----
    return scm_uniform_vector_writable_elements (uvec, handle, lenp,
incp);
  }
  
! static SCM_C_INLINE const void *
  uvec_elements (int type, SCM uvec, scm_t_array_handle *handle,
               size_t *lenp, ssize_t *incp)
  {
***************
*** 503,509 ****
    return res;
  }
  
! static SCM_C_INLINE_KEYWORD SCM
  uvec_length (int type, SCM uvec)
  {
    scm_t_array_handle handle;
--- 503,509 ----
    return res;
  }
  
! static SCM_C_INLINE SCM
  uvec_length (int type, SCM uvec)
  {
    scm_t_array_handle handle;
***************
*** 514,520 ****
    return scm_from_size_t (len);
  }
  
! static SCM_C_INLINE_KEYWORD SCM
  uvec_ref (int type, SCM uvec, SCM idx)
  {
    scm_t_array_handle handle;
--- 514,520 ----
    return scm_from_size_t (len);
  }
  
! static SCM_C_INLINE SCM
  uvec_ref (int type, SCM uvec, SCM idx)
  {
    scm_t_array_handle handle;
***************
*** 532,538 ****
    return res;
  }
  
! static SCM_C_INLINE_KEYWORD SCM
  uvec_set_x (int type, SCM uvec, SCM idx, SCM val)
  {
    scm_t_array_handle handle;
--- 532,538 ----
    return res;
  }
  
! static SCM_C_INLINE SCM
  uvec_set_x (int type, SCM uvec, SCM idx, SCM val)
  {
    scm_t_array_handle handle;
***************
*** 549,555 ****
    return SCM_UNSPECIFIED;
  }
  
! static SCM_C_INLINE_KEYWORD SCM
  list_to_uvec (int type, SCM list)
  {
    SCM uvec;
--- 549,555 ----
    return SCM_UNSPECIFIED;
  }
  
! static SCM_C_INLINE SCM
  list_to_uvec (int type, SCM list)
  {
    SCM uvec;


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com