- fixed a small oops: iprint() didn't reset the number output format to decimal

[ginac.git] / ginsh / ginsh.h

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index c225fb09433503eb6598d9a8d40c7459d6ea823b..3cab831970c87a20419e0b615bede59386c38f35 100644 (file)
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -2,7 +2,7 @@
  *
  *  Global definitions for ginsh.
  *
  *
  *  Global definitions for ginsh.
  *

- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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
  *
  *  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


@@ -41,8 +41,15 @@ extern "C" {
 }
 #endif
 
 }
 #endif
 

+#ifdef IN_GINAC
+#include "ginac.h"
+#else

 #include <ginac/ginac.h>
 #include <ginac/ginac.h>

+#endif
+
+#ifndef NO_NAMESPACE_GINAC

 using namespace GiNaC;
 using namespace GiNaC;

+#endif // ndef NO_NAMESPACE_GINAC

 
 // yacc stack type
 #define YYSTYPE ex
 
 // yacc stack type
 #define YYSTYPE ex