From: Kim F. Storm <storm@cua.dk>
Date: Thu, 21 Mar 2002 12:22:32 +0000 (+0000)
Subject: (QCtype): Remove duplicate declaration and
X-Git-Tag: ttn-vms-21-2-B4~16043
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=778140350cd3c2c9235112058b153b5002b012fb;p=emacs.git

(QCtype): Remove duplicate declaration and
initialization (is now declared in process.c).
---

diff --git a/src/w32fns.c b/src/w32fns.c
index 82767a029c1..4cf12d0f988 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8168,8 +8168,8 @@ Lisp_Object Qxbm;
 /* Keywords.  */
 
 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile;
-extern Lisp_Object QCdata;
-Lisp_Object QCtype, QCascent, QCmargin, QCrelief;
+extern Lisp_Object QCdata, QCtype;
+Lisp_Object QCascent, QCmargin, QCrelief;
 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask;
 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask;
 
@@ -15238,8 +15238,6 @@ versions of Windows) characters.  */);
   /* Images.  */
   Qxbm = intern ("xbm");
   staticpro (&Qxbm);
-  QCtype = intern (":type");
-  staticpro (&QCtype);
   QCconversion = intern (":conversion");
   staticpro (&QCconversion);
   QCheuristic_mask = intern (":heuristic-mask");
diff --git a/src/xfns.c b/src/xfns.c
index 07097837080..1f22f007ba5 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5455,8 +5455,8 @@ Lisp_Object Qxbm;
 /* Keywords.  */
 
 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile;
-extern Lisp_Object QCdata;
-Lisp_Object QCtype, QCascent, QCmargin, QCrelief;
+extern Lisp_Object QCdata, QCtype;
+Lisp_Object QCascent, QCmargin, QCrelief;
 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask;
 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask;
 
@@ -12121,8 +12121,6 @@ meaning don't clear the cache.  */);
   /* Images.  */
   Qxbm = intern ("xbm");
   staticpro (&Qxbm);
-  QCtype = intern (":type");
-  staticpro (&QCtype);
   QCconversion = intern (":conversion");
   staticpro (&QCconversion);
   QCheuristic_mask = intern (":heuristic-mask");