scratch/igc 14a9836bf02: [MPS] Remove remaining references to XHASH/lisp_h_XHASH

[Pip Cet]

branch: scratch/igc
commit 14a9836bf0262d391d15c105bf4c9f24dee217fb
Author: Pip Cet <pipcet@protonmail.com>
Commit: Pip Cet <pipcet@protonmail.com>

    [MPS] Remove remaining references to XHASH/lisp_h_XHASH
    
    * src/eval.c (Fautoload): Use `Fsxhash_eq', not `lisp_h_XHASH'.
    * src/lisp.h (XHASH, lisp_h_XHASH): Remove macro definitions if
    HAVE_MPS.
---
 src/eval.c | 2 +-
 src/lisp.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/eval.c b/src/eval.c
index 0cedd89d618..c59078443ce 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2338,7 +2338,7 @@ this does nothing and returns nil.  */)
        and assumed the docstring will be provided by Snarf-documentation, so it
        passed us 0 instead.  But that leads to accidental sharing in purecopy's
        hash-consing, so we use a (hopefully) unique integer instead.  */
-    docstring = make_ufixnum (lisp_h_XHASH (function));
+    docstring = Fsxhash_eq (function);
   return Fdefalias (function,
                    list5 (Qautoload, file, docstring, interactive, type),
                    Qnil);
diff --git a/src/lisp.h b/src/lisp.h
index 32974d29a24..48585c2d8a1 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -449,7 +449,9 @@ typedef EMACS_INT Lisp_Word;
 #define lisp_h_VECTORLIKEP(x) TAGGEDP (x, Lisp_Vectorlike)
 #define lisp_h_XCAR(c) XCONS (c)->u.s.car
 #define lisp_h_XCDR(c) XCONS (c)->u.s.u.cdr
+#ifndef HAVE_MPS
 #define lisp_h_XHASH(a) XUFIXNUM_RAW (a)
+#endif
 #if USE_LSB_TAG
 # define lisp_h_make_fixnum_wrap(n) \
     XIL ((EMACS_INT) (((EMACS_UINT) (n) << INTTYPEBITS) + Lisp_Int0))
@@ -499,7 +501,9 @@ typedef EMACS_INT Lisp_Word;
 # define VECTORLIKEP(x) lisp_h_VECTORLIKEP (x)
 # define XCAR(c) lisp_h_XCAR (c)
 # define XCDR(c) lisp_h_XCDR (c)
+#ifndef HAVE_MPS
 # define XHASH(a) lisp_h_XHASH (a)
+#endif
 # if USE_LSB_TAG
 #  define make_fixnum(n) lisp_h_make_fixnum (n)
 #  define XFIXNUM_RAW(a) lisp_h_XFIXNUM_RAW (a)