X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginsh%2Fginsh.h;h=36b8308a43eaf90c9eb0996629d840b38c8d768f;hb=87ed87c395d6121fe468efc68ee2cd33a7e91200;hp=351e476eccf6d72b6ff55dc0d2d98aa120133ec2;hpb=52fec0ff3ba58d05dcaa8401c972f7d9263217c7;p=ginac.git

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index 351e476e..36b8308a 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-2010 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,8 +27,11 @@
 #include <string.h>
 
 #include <map>
+#include <iostream>
 #include <string>
 
+using namespace std;
+
 #ifdef HAVE_READLINE_READLINE_H
 extern "C" {
 #include <readline/readline.h>
@@ -41,11 +44,13 @@ extern "C" {
 }
 #endif
 
+#ifdef IN_GINAC
+#include "ginac.h"
+#else
 #include <ginac/ginac.h>
+#endif
 
-#ifndef NO_GINAC_NAMESPACE
 using namespace GiNaC;
-#endif // ndef NO_GINAC_NAMESPACE
 
 // yacc stack type
 #define YYSTYPE ex
@@ -53,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
@@ -65,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