diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-01-22 14:48:40 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-01-22 14:48:40 +0100 |
| commit | baf90102cf39f4fdfb446df9ba8f4407b88ea794 (patch) | |
| tree | 7109d0c6d04c86027bc4e06895e1eea958b73ac8 | |
| parent | 1cd779140dd74ddfaa62032882cb4745c2302cee (diff) | |
| parent | 894d0b894daae001495c748b3352cd79918d3789 (diff) | |
Merge commit '894d0b894daae001495c748b3352cd79918d3789'
Conflicts:
libguile/hash.c
| -rw-r--r-- | libguile/hash.c | 8 | ||||
| -rw-r--r-- | libguile/hash.h | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/libguile/hash.c b/libguile/hash.c index 0ac67fa1f..b0bf04629 100644 --- a/libguile/hash.c +++ b/libguile/hash.c @@ -1,5 +1,5 @@ /* Copyright (C) 1995, 1996, 1997, 2000, 2001, 2003, 2004, 2006, 2008, - * 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + * 2009, 2010, 2011, 2012, 2014, 2015 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 @@ -127,12 +127,6 @@ wide_string_hash (const scm_t_wchar *str, size_t len) } unsigned long -scm_string_hash (const unsigned char *str, size_t len) -{ - return narrow_string_hash (str, len); -} - -unsigned long scm_i_string_hash (SCM str) { size_t len = scm_i_string_length (str); diff --git a/libguile/hash.h b/libguile/hash.h index d3e42f1c1..9085bc037 100644 --- a/libguile/hash.h +++ b/libguile/hash.h @@ -3,7 +3,8 @@ #ifndef SCM_HASH_H #define SCM_HASH_H -/* Copyright (C) 1995,1996,2000, 2006, 2008, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 2000, 2006, 2008, 2011, + * 2015 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 @@ -27,7 +28,6 @@ -SCM_API unsigned long scm_string_hash (const unsigned char *str, size_t len); SCM_INTERNAL unsigned long scm_i_locale_string_hash (const char *str, size_t len); SCM_INTERNAL unsigned long scm_i_latin1_string_hash (const char *str, |