gcl.git - GNU Common Lisp

diff --git a/gcl/o/file.d b/gcl/o/file.d
index 9885e67bd..5f4b62e21 100755
--- a/gcl/o/file.d
+++ b/gcl/o/file.d

@@ -268,7 +268,7 @@ BEGIN:

return(strm->sm.sm_object0);

case smm_socket:

- return (sLstring_char);

+ return (sLcharacter);

case smm_synonym:

strm = symbol_value(strm->sm.sm_object0);

@@ -295,10 +295,10 @@ BEGIN:

return(stream_element_type(STREAM_INPUT_STREAM(strm)));

case smm_string_input:

- return(sLstring_char);

+ return(sLcharacter);

case smm_string_output:

- return(sLstring_char);

+ return(sLcharacter);

default:

error("illegal stream mode");

@@ -512,7 +512,7 @@ object if_exists, if_does_not_exist;

x->sm.sm_fp = fp;

x->sm.sm_buffer = 0;

- x->sm.sm_object0 = (unzipped ? make_cons(sSAallow_gzipped_fileA,unzipped) : sLstring_char);

+ x->sm.sm_object0 = (unzipped ? make_cons(sSAallow_gzipped_fileA,unzipped) : sLcharacter);

x->sm.sm_object1 = fn;

x->sm.sm_int0 = x->sm.sm_int1 = 0;

vs_push(x);

@@ -1715,7 +1715,7 @@ LFD(Lstream_element_type)()

@(static defun open (filename

&key (direction sKinput)

- (element_type sLstring_char)

+ (element_type sLcharacter)

(if_exists Cnil iesp)

(if_does_not_exist Cnil idnesp)

&aux strm)

@@ -2534,7 +2534,7 @@ gcl_init_file(void)

standard_input->sm.sm_mode = (short)smm_input;

standard_input->sm.sm_fp = stdin;

standard_input->sm.sm_buffer = 0;

- standard_input->sm.sm_object0 = sLstring_char;

+ standard_input->sm.sm_object0 = sLcharacter;

standard_input->sm.sm_object1

#ifdef UNIX

= make_simple_string("stdin");

@@ -2546,7 +2546,7 @@ gcl_init_file(void)

standard_output->sm.sm_mode = (short)smm_output;

standard_output->sm.sm_fp = stdout;

standard_output->sm.sm_buffer = 0;

- standard_output->sm.sm_object0 = sLstring_char;

+ standard_output->sm.sm_object0 = sLcharacter;

standard_output->sm.sm_object1

#ifdef UNIX

= make_simple_string("stdout");

diff --git a/gcl/o/run_process.c b/gcl/o/run_process.c
index f6c39c327..0cfcfc229 100755
--- a/gcl/o/run_process.c
+++ b/gcl/o/run_process.c

@@ -432,7 +432,7 @@ enum smmode smm;

stream->sm.sm_fp = fp;

stream->sm.sm_buffer = 0;

- stream->sm.sm_object0 = sLstring_char;

+ stream->sm.sm_object0 = sLcharacter;

stream->sm.sm_object1 = host_l;

stream->sm.sm_int0 = stream->sm.sm_int1 = 0;

vs_push(stream);

diff --git a/gcl/o/sfaslbfd.c b/gcl/o/sfaslbfd.c
index 61f5f37ff..296fe4cd9 100644
--- a/gcl/o/sfaslbfd.c
+++ b/gcl/o/sfaslbfd.c

@@ -212,7 +212,7 @@ fasload(object faslfile) {

set_type_of(&dum,t_stream);

dum.sm.sm_mode=smm_input;

- dum.sm.sm_object0=sLstring_char;

+ dum.sm.sm_object0=sLcharacter;

link_callbacks.add_archive_element=madd_archive_element;

link_callbacks.multiple_definition=mmultiple_definition;

diff --git a/gcl/o/string.d b/gcl/o/string.d
index ee847b508..c262b17e4 100755
--- a/gcl/o/string.d
+++ b/gcl/o/string.d

@@ -403,7 +403,7 @@ LFD(Lstring_not_equal)() { string_sign = 0; string_boundary = 1; FFN(Lstring

char_bits(initial_element) != 0 ||

char_font(initial_element) != 0)

initial_element

- = wrong_type_argument(sLstring_char, initial_element);

+ = wrong_type_argument(sLcharacter, initial_element);

{BEGIN_NO_INTERRUPT;

x = alloc_simple_string(fix(size));

x->st.st_self = alloc_relblock(fix(size));

diff --git a/gcl/o/typespec.c b/gcl/o/typespec.c
index 5689cc1e7..69bc7879c 100755
--- a/gcl/o/typespec.c
+++ b/gcl/o/typespec.c

@@ -73,7 +73,7 @@ LFD(Ltype_of)(void)

if ((' ' <= i && i < '177円') || i == '\n')

vs_base[0] = sLstandard_char;

else

- vs_base[0] = sLstring_char;

+ vs_base[0] = sLcharacter;

}

break;