aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-11-08 16:08:12 -0800
committerPaul Eggert2012-11-08 16:08:12 -0800
commit53371430cdd6fe4e9d8c4a29f0b1db47165c9868 (patch)
tree4103bf92baaa839cff2f4311ee6721c83f434acc /src
parentc01f021313dcc50bdf8d4aa28e583214c5bba14c (diff)
downloademacs-53371430cdd6fe4e9d8c4a29f0b1db47165c9868.tar.gz
emacs-53371430cdd6fe4e9d8c4a29f0b1db47165c9868.zip
* fns.c (Qeql, hashtest_eq): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fns.c7
-rw-r--r--src/lisp.h4
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 @@
12012-11-09 Paul Eggert <eggert@cs.ucla.edu>
2
3 * fns.c (Qeql, hashtest_eq): Now static.
4
12012-11-08 Stefan Monnier <monnier@iro.umontreal.ca> 52012-11-08 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * lisp.h (XHASH): Redefine to be imperfect and fit in a Lisp int. 7 * 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;
3331 3331
3332/* Various symbols. */ 3332/* Various symbols. */
3333 3333
3334static Lisp_Object Qhash_table_p, Qkey, Qvalue; 3334static Lisp_Object Qhash_table_p, Qkey, Qvalue, Qeql;
3335Lisp_Object Qeq, Qeql, Qequal; 3335Lisp_Object Qeq, Qequal;
3336Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness; 3336Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness;
3337static Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value; 3337static Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value;
3338 3338
@@ -3424,7 +3424,8 @@ larger_vector (Lisp_Object vec, ptrdiff_t incr_min, ptrdiff_t nitems_max)
3424 Low-level Functions 3424 Low-level Functions
3425 ***********************************************************************/ 3425 ***********************************************************************/
3426 3426
3427struct hash_table_test hashtest_eq, hashtest_eql, hashtest_equal; 3427static struct hash_table_test hashtest_eq;
3428struct hash_table_test hashtest_eql, hashtest_equal;
3428 3429
3429/* Compare KEY1 which has hash code HASH1 and KEY2 with hash code 3430/* Compare KEY1 which has hash code HASH1 and KEY2 with hash code
3430 HASH2 in hash table H using `eql'. Value is true if KEY1 and 3431 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);
2719extern void sweep_weak_hash_tables (void); 2719extern void sweep_weak_hash_tables (void);
2720extern Lisp_Object Qcursor_in_echo_area; 2720extern Lisp_Object Qcursor_in_echo_area;
2721extern Lisp_Object Qstring_lessp; 2721extern Lisp_Object Qstring_lessp;
2722extern Lisp_Object QCsize, QCtest, QCweakness, Qequal, Qeq, Qeql; 2722extern Lisp_Object QCsize, QCtest, QCweakness, Qequal, Qeq;
2723EMACS_UINT hash_string (char const *, ptrdiff_t); 2723EMACS_UINT hash_string (char const *, ptrdiff_t);
2724EMACS_UINT sxhash (Lisp_Object, int); 2724EMACS_UINT sxhash (Lisp_Object, int);
2725Lisp_Object make_hash_table (struct hash_table_test, Lisp_Object, Lisp_Object, 2725Lisp_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,
2727ptrdiff_t hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, EMACS_UINT *); 2727ptrdiff_t hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, EMACS_UINT *);
2728ptrdiff_t hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object, 2728ptrdiff_t hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object,
2729 EMACS_UINT); 2729 EMACS_UINT);
2730extern struct hash_table_test hashtest_eq, hashtest_eql, hashtest_equal; 2730extern struct hash_table_test hashtest_eql, hashtest_equal;
2731 2731
2732extern Lisp_Object substring_both (Lisp_Object, ptrdiff_t, ptrdiff_t, 2732extern Lisp_Object substring_both (Lisp_Object, ptrdiff_t, ptrdiff_t,
2733 ptrdiff_t, ptrdiff_t); 2733 ptrdiff_t, ptrdiff_t);