From 53371430cdd6fe4e9d8c4a29f0b1db47165c9868 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 8 Nov 2012 16:08:12 -0800 Subject: [PATCH] * fns.c (Qeql, hashtest_eq): Now static. --- src/ChangeLog | 4 ++++ src/fns.c | 7 ++++--- src/lisp.h | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a8f1abd799f..42c63b21e95 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-11-09 Paul Eggert + + * fns.c (Qeql, hashtest_eq): Now static. + 2012-11-08 Stefan Monnier * lisp.h (XHASH): Redefine to be imperfect and fit in a Lisp int. diff --git a/src/fns.c b/src/fns.c index c07c013ccc7..7c2222e9805 100644 --- a/src/fns.c +++ b/src/fns.c @@ -3331,8 +3331,8 @@ static struct Lisp_Hash_Table *weak_hash_tables; /* Various symbols. */ -static Lisp_Object Qhash_table_p, Qkey, Qvalue; -Lisp_Object Qeq, Qeql, Qequal; +static Lisp_Object Qhash_table_p, Qkey, Qvalue, Qeql; +Lisp_Object Qeq, Qequal; Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness; static Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value; @@ -3424,7 +3424,8 @@ larger_vector (Lisp_Object vec, ptrdiff_t incr_min, ptrdiff_t nitems_max) Low-level Functions ***********************************************************************/ -struct hash_table_test hashtest_eq, hashtest_eql, hashtest_equal; +static struct hash_table_test hashtest_eq; +struct hash_table_test hashtest_eql, hashtest_equal; /* Compare KEY1 which has hash code HASH1 and KEY2 with hash code HASH2 in hash table H using `eql'. Value is true if KEY1 and diff --git a/src/lisp.h b/src/lisp.h index d940df196e8..e2c1cc0e169 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2719,7 +2719,7 @@ extern Lisp_Object larger_vector (Lisp_Object, ptrdiff_t, ptrdiff_t); extern void sweep_weak_hash_tables (void); extern Lisp_Object Qcursor_in_echo_area; extern Lisp_Object Qstring_lessp; -extern Lisp_Object QCsize, QCtest, QCweakness, Qequal, Qeq, Qeql; +extern Lisp_Object QCsize, QCtest, QCweakness, Qequal, Qeq; EMACS_UINT hash_string (char const *, ptrdiff_t); EMACS_UINT sxhash (Lisp_Object, int); Lisp_Object make_hash_table (struct hash_table_test, Lisp_Object, Lisp_Object, @@ -2727,7 +2727,7 @@ Lisp_Object make_hash_table (struct hash_table_test, Lisp_Object, Lisp_Object, ptrdiff_t hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, EMACS_UINT *); ptrdiff_t hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object, EMACS_UINT); -extern struct hash_table_test hashtest_eq, hashtest_eql, hashtest_equal; +extern struct hash_table_test hashtest_eql, hashtest_equal; extern Lisp_Object substring_both (Lisp_Object, ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t); -- 2.39.2