X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginsh%2Fginsh.h;h=9d8ef85af64cf1c90086fcafd093b67115d99556;hb=8fdf123fe6dac43ad7b8020d7bb7446c51cf75e7;hp=ddd83ea03cd2233ac33b102b8f9fa3f2cfba2904;hpb=f54584fc4f72d28a070c26981a98fa34919ca455;p=ginac.git

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index ddd83ea0..9d8ef85a 100644
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -2,7 +2,7 @@
  *
  *  Global definitions for ginsh.
  *
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef GINSH_H
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include <map>
+#include <iostream>
 #include <string>
 
 using namespace std;
@@ -49,9 +50,7 @@ extern "C" {
 #include <ginac/ginac.h>
 #endif
 
-#ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
-#endif // ndef NO_NAMESPACE_GINAC
 
 // yacc stack type
 #define YYSTYPE ex
@@ -59,11 +58,7 @@ using namespace GiNaC;
 // lex functions/variables
 extern int yyerror(char *s);
 extern int yylex(void);
-#if YYTEXT_POINTER
 extern char *yytext;
-#else
-extern char yytext[];
-#endif
 extern FILE *yyin;
 
 // List of input files to be processed
@@ -71,7 +66,10 @@ extern int num_files;
 extern char **file_list;
 
 // Table of all used symbols
-typedef map<string, symbol> sym_tab;
+typedef map<string, ex> sym_tab;
 extern sym_tab syms;
 
+// Type of symbols to generate (real or complex)
+extern unsigned symboltype;
+
 #endif