subs_no_pattern -> no_pattern, subs_algebraic -> algebraic

[ginac.git] / ginsh / ginsh.h

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index c225fb09433503eb6598d9a8d40c7459d6ea823b..bcdfe9ae4666f569a12d281b19d2d0ead9a2648e 100644 (file)
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -2,7 +2,7 @@
  *
  *  Global definitions for ginsh.
  *
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -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,7 +44,12 @@ extern "C" {
 }
 #endif
 
+#ifdef IN_GINAC
+#include "ginac.h"
+#else
 #include <ginac/ginac.h>
+#endif
+
 using namespace GiNaC;
 
 // yacc stack type