mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-11 14:21:10 +02:00
Code Activity

Merge commit '894d0b894d'

Browse source 
Conflicts:
	libguile/hash.c
This commit is contained in:
Andy Wingo 2015-01-22 14:48:40 +01:00
commit baf90102cf
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/hash.c
View file

@ -1,5 +1,5 @@
/* Copyright (C) 1995, 1996, 1997, 2000, 2001, 2003, 2004, 2006, 2008, /* 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
@ -126,12 +126,6 @@ wide_string_hash (const scm_t_wchar *str, size_t len)
return ret; return ret;
} }
unsigned long
scm_string_hash (const unsigned char *str, size_t len)
{
return narrow_string_hash (str, len);
}
unsigned long unsigned long
scm_i_string_hash (SCM str) scm_i_string_hash (SCM str)
{ {

4
libguile/hash.h
View file

@ -3,7 +3,8 @@
#ifndef SCM_HASH_H #ifndef SCM_HASH_H
#define 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * 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, SCM_INTERNAL unsigned long scm_i_locale_string_hash (const char *str,
size_t len); size_t len);
SCM_INTERNAL unsigned long scm_i_latin1_string_hash (const char *str, SCM_INTERNAL unsigned long scm_i_latin1_string_hash (const char *str,