Ar an ceathrú lá déag de mí na Samhain, scríobh Vin Shelton:
Aidan,
With current 21.5 CVS, I'm getting the following errors:
icc -c -Os -ip -Demacs -I. -I/opt/src/xemacs-21.5-2007-11-14/src
-DHAVE_CONFIG_H -I/opt/include
/opt/src/xemacs-21.5-2007-11-14/src/unicode.c
/opt/src/xemacs-21.5-2007-11-14/src/unicode.c(2865): error: identifier
"Vnumber_of_jit_charsets" is undefined
staticpro (&Vnumber_of_jit_charsets);
^
/opt/src/xemacs-21.5-2007-11-14/src/unicode.c(2867): error: identifier
"Vlast_jit_charset_final" is undefined
staticpro (&Vlast_jit_charset_final);
^
/opt/src/xemacs-21.5-2007-11-14/src/unicode.c(2869): error: identifier
"Vcharset_descr" is undefined
staticpro (&Vcharset_descr);
^
compilation aborted for /opt/src/xemacs-21.5-2007-11-14/src/unicode.c (code 2)
make[1]: *** [unicode.o] Error 2
make[1]: Leaving directory `/opt/build/xemacs-21.5-2007-11-14/src'
make: *** [src] Error 2
Is this related to your change?
Yes--the attached change fixes the non-Mule build for me. (The absence of
Mule was the difference between what I tested locally and what your
Installation file said.) Thank you for the report!
APPROVE COMMIT
NOTE: This patch has been committed.
src/ChangeLog addition:
2007-11-15 Aidan Kehoe <kehoea(a)parhasard.net>
* unicode.c (coding_system_type_create_unicode):
* unicode.c (vars_of_unicode):
Move the initialisation of Vnumber_of_jit_charsets,
Vlast_jit_charset_final, Vcharset_descr to an #ifdef MULE block in
vars_of_unicode. Fixes a build failure reported by Vin
Shelton--thank you Vin!
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/unicode.c
===================================================================
RCS
Index: src/unicode.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unicode.c,v
retrieving revision 1.39
diff -u -r1.39 unicode.c
--- src/unicode.c 2007/11/14 19:41:09 1.39
+++ src/unicode.c 2007/11/15 10:02:34
@@ -2862,14 +2862,6 @@
void
coding_system_type_create_unicode (void)
{
- staticpro (&Vnumber_of_jit_charsets);
- Vnumber_of_jit_charsets = make_int (0);
- staticpro (&Vlast_jit_charset_final);
- Vlast_jit_charset_final = make_char (0x30);
- staticpro (&Vcharset_descr);
- Vcharset_descr
- = build_string ("Mule charset for otherwise unknown Unicode code
points.");
-
INITIALIZE_CODING_SYSTEM_TYPE_WITH_DATA (unicode,
"unicode-coding-system-p");
CODING_SYSTEM_HAS_METHOD (unicode, print);
CODING_SYSTEM_HAS_METHOD (unicode, convert);
@@ -2907,6 +2899,14 @@
Fprovide (intern ("unicode"));
#ifdef MULE
+ staticpro (&Vnumber_of_jit_charsets);
+ Vnumber_of_jit_charsets = make_int (0);
+ staticpro (&Vlast_jit_charset_final);
+ Vlast_jit_charset_final = make_char (0x30);
+ staticpro (&Vcharset_descr);
+ Vcharset_descr
+ = build_string ("Mule charset for otherwise unknown Unicode code
points.");
+
staticpro (&Vlanguage_unicode_precedence_list);
Vlanguage_unicode_precedence_list = Qnil;
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
precipitadamente de la aldea por culpo de la escasez de rinocerontes?
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta