(QCtype): Remove duplicate declaration and

initialization (is now declared in process.c).

(QCtype): Remove duplicate declaration and
initialization (is now declared in process.c).
77814035 · Kim F. Storm · 9057ff80 · 77814035 · 77814035
Commit 77814035 authored Mar 21, 2002 by Kim F. Storm
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

src/w32fns.c src/w32fns.c +2 -4

src/xfns.c src/xfns.c +2 -4

No files found.
--- 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");

--- 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");