Remove now-unnecessary forward XTYPE decl

* lisp.h (XTYPE): Remove forward declaration.  The recent merge
from emacs-24 fixed the problem in a better way, by moving XPNTR's
definition to after XTYPE's.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2f40a463ed45df3952f105ee8fd66fa6bafbdc78..7ec6980bd088b17449adfce52e988529215d2b4b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Remove now-unnecessary forward XTYPE decl
+       * lisp.h (XTYPE): Remove forward declaration.  The recent merge
+       from emacs-24 fixed the problem in a better way, by moving XPNTR's
+       definition to after XTYPE's.
+
 2015-01-13  Eli Zaretskii  <eliz@gnu.org>
 
        Fix problems with 32-bit wide-int build exposed by MinGW.

diff --git a/src/lisp.h b/src/lisp.h
index ba1aff8e796207913bfad3cf10c5916f1b2516cf..51556fcc91c9cac0173b7a89625a7eca96d30d15 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -610,7 +610,6 @@ INLINE bool (VECTORLIKEP) (Lisp_Object);
 INLINE bool WINDOWP (Lisp_Object);
 INLINE struct Lisp_Save_Value *XSAVE_VALUE (Lisp_Object);
 INLINE struct Lisp_Symbol *(XSYMBOL) (Lisp_Object);
-INLINE enum Lisp_Type (XTYPE) (Lisp_Object);
 INLINE void *(XUNTAG) (Lisp_Object, int);
 
 /* Defined in chartab.c.  */