[COMMIT] Take the declaration of Qfinal out of mule-charset.c

[Aidan Kehoe]

 Ar an s?i? l? de m? na Samhain, scr?obh Vin Shelton: 

 > After updating to the latest CVS, I'm now getting a link error:
 > 
 >         link.exe @c:\DOCUME~1\vshelton\LOCALS~1\Temp\nmb02264.
 > general.obj : error LNK2005: _Qfinal already defined in mule-charset.obj
 > e:\cygwin\usr\local\src\xemacs-21.5-2006-11-06\src\temacs.exe : fatal
 > error LNK1169: one or more multiply defined symbols found
 > NMAKE : fatal error U1077: 'link.exe' : return code '0x491'
 > Stop.

After the below commit, with Visual C++ 2005 Express Edition, make-docfile
segfaults. I touch lib-src/DOC to have the compile continue, and then I get
this: 

[...]
Dumping under the name xemacs
NMAKE: fatal error U1077: '"D:\Cygwin\home\Aidan\xemacs-21.5\lib-src\i"'
: return code '0x80000003'
Stop.
D:\Cygwin\home\Aidan\xemacs-21.5\nt>

This seems to be something specific to my install; if you?ve seen it before
I?d love a pointer to how to avoid it. 

APPROVE COMMIT

NOTE: This patch has been committed.

src/ChangeLog addition:

2006-11-07  Aidan Kehoe  <kehoea at parhasard.net>

	* mule-charset.c:
	Take the Qfinal declaration out of mule-charset.c; fixes the MSVC
	build. Sorry Vin!
	

XEmacs Trunk source patch:
Diff command:   cvs -q diff -u
Files affected: src/mule-charset.c
===================================================================
RCS

Index: src/mule-charset.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-charset.c,v
retrieving revision 1.49
diff -u -r1.49 mule-charset.c
--- src/mule-charset.c	2006/11/06 19:35:45	1.49
+++ src/mule-charset.c	2006/11/07 14:02:46
@@ -79,8 +79,8 @@
 
 Lisp_Object Qcharsetp;
 
-/* Qdoc_string, Qdimension, Qchars defined in general.c */
-Lisp_Object Qregistries, Qfinal, Qgraphic, Qregistry;
+/* Qdoc_string, Qdimension, Qchars, Qfinal defined in general.c */
+Lisp_Object Qregistries, Qgraphic, Qregistry;
 Lisp_Object Qdirection;
 Lisp_Object Qreverse_direction_charset;
 Lisp_Object Qshort_name, Qlong_name;

-- 
Santa Maradona, priez pour moi!