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.

2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2f40a463ed4..7ec6980bd08 100644
--- 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 ba1aff8e796..51556fcc91c 100644
--- 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.  */