X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flispreader.cpp;h=9074633f9886f277bd6d961d3a61e1bbdf2593e3;hb=6074972382238a94397b649650738daf0d869775;hp=0ece43d836d9cd1bd3eaf46e708577d9bb8ae14c;hpb=1cf03f7192b1840362da1a9eebcf3d68d7a4e8f6;p=supertux.git diff --git a/src/lispreader.cpp b/src/lispreader.cpp index 0ece43d83..9074633f9 100644 --- a/src/lispreader.cpp +++ b/src/lispreader.cpp @@ -21,6 +21,7 @@ * Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -48,10 +49,10 @@ static char token_string[MAX_TOKEN_LENGTH + 1] = ""; static int token_length = 0; -static lisp_object_t end_marker = { LISP_TYPE_EOF , {0,0} }; -static lisp_object_t error_object = { LISP_TYPE_PARSE_ERROR , {0,0} }; -static lisp_object_t close_paren_marker = { LISP_TYPE_PARSE_ERROR , {0,0} }; -static lisp_object_t dot_marker = { LISP_TYPE_PARSE_ERROR , {0,0} }; +static lisp_object_t end_marker = { LISP_TYPE_EOF, {{0, 0}} }; +static lisp_object_t error_object = { LISP_TYPE_PARSE_ERROR , {{0,0}} }; +static lisp_object_t close_paren_marker = { LISP_TYPE_PARSE_ERROR , {{0,0}} }; +static lisp_object_t dot_marker = { LISP_TYPE_PARSE_ERROR , {{0,0}} }; static void _token_clear (void) @@ -1316,18 +1317,6 @@ lisp_object_t* lisp_read_from_file(const std::string& filename) if (has_suffix(filename.c_str(), ".gz")) { return lisp_read_from_gzfile(filename.c_str()); -#if 0 - lisp_object_t* obj = 0; - gzFile in = gzopen(filename, "r"); - - if (in) - { - lisp_stream_init_gzfile(&stream, in); - obj = lisp_read(&stream); - gzclose(in); - } - return obj; -#endif } else {