# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1253431662 -3600
# Node ID 3ba90c659d016e232277b6e9b2eab18cd9c4d71a
# Parent  257b468bf2cacce31a96c9db0cc5812967289ace
Move Qfrom_unicode to general-slots.h, fix the native Win32 build.

2009-09-20  Aidan Kehoe  <kehoea@parhasard.net>

	* general-slots.h:
	* mule-coding.c (syms_of_mule_coding):
	* mule-charset.c (syms_of_mule_charset):
	Move Qfrom_unicode to general-slots.h, now it's used in more than
	one file. Fixes the native Win32 build; thank you Vin!

diff -r 257b468bf2ca -r 3ba90c659d01 src/ChangeLog
--- a/src/ChangeLog	Sat Sep 19 22:53:13 2009 +0100
+++ b/src/ChangeLog	Sun Sep 20 08:27:42 2009 +0100
@@ -1,3 +1,11 @@
+2009-09-20  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* general-slots.h: 
+	* mule-coding.c (syms_of_mule_coding): 
+	* mule-charset.c (syms_of_mule_charset): 
+	Move Qfrom_unicode to general-slots.h, now it's used in more than
+	one file. Fixes the native Win32 build; thank you Vin!
+
 2009-09-19  Aidan Kehoe  <kehoea@parhasard.net>
 
 	Move the #'query-coding-region implementation to C.
diff -r 257b468bf2ca -r 3ba90c659d01 src/general-slots.h
--- a/src/general-slots.h	Sat Sep 19 22:53:13 2009 +0100
+++ b/src/general-slots.h	Sun Sep 20 08:27:42 2009 +0100
@@ -137,6 +137,7 @@
 SYMBOL (Qframe);
 SYMBOL (Qframes);
 SYMBOL (Qfrom_page);
+SYMBOL (Qfrom_unicode);
 SYMBOL (Qfull_assoc);
 SYMBOL (Qfuncall);
 SYMBOL (Qfunction);
diff -r 257b468bf2ca -r 3ba90c659d01 src/mule-charset.c
--- a/src/mule-charset.c	Sat Sep 19 22:53:13 2009 +0100
+++ b/src/mule-charset.c	Sun Sep 20 08:27:42 2009 +0100
@@ -84,7 +84,7 @@
 Lisp_Object Qreverse_direction_charset;
 Lisp_Object Qshort_name, Qlong_name;
 
-Lisp_Object Qfrom_unicode, Qto_unicode;
+Lisp_Object Qto_unicode;
 
 Lisp_Object
   Qlatin_iso8859_1,
@@ -1096,7 +1096,6 @@
   DEFSYMBOL (Qshort_name);
   DEFSYMBOL (Qlong_name);
 
-  DEFSYMBOL (Qfrom_unicode);
   DEFSYMBOL (Qto_unicode);
 
   DEFSYMBOL (Ql2r);
diff -r 257b468bf2ca -r 3ba90c659d01 src/mule-coding.c
--- a/src/mule-coding.c	Sat Sep 19 22:53:13 2009 +0100
+++ b/src/mule-coding.c	Sun Sep 20 08:27:42 2009 +0100
@@ -52,7 +52,7 @@
 
 Lisp_Object Qiso_7, Qiso_8_designate, Qiso_8_1, Qiso_8_2, Qiso_lock_shift;
 
-Lisp_Object Qfrom_unicode, Qquery_skip_chars, Qinvalid_sequences_skip_chars;
+Lisp_Object Qquery_skip_chars, Qinvalid_sequences_skip_chars;
 Lisp_Object Qfixed_width;
 
 
@@ -3935,7 +3935,6 @@
   DEFSYMBOL (Qiso_8_2);
   DEFSYMBOL (Qiso_lock_shift);
 
-  DEFSYMBOL (Qfrom_unicode);
   DEFSYMBOL (Qinvalid_sequences_skip_chars);
   DEFSYMBOL (Qquery_skip_chars);
   DEFSYMBOL (Qfixed_width);