X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_parser.yy;h=fb6edb05ed92d98526b70988e4025f801a927a4e;hp=7a94f1f8e3a13b78022fc25b84cf2e4bd198b2b1;hb=97af29c12bb3074cfb4e674d71000f0712c51ba2;hpb=f5b3b828a0c67c1f2c9a8931d980505c3475beef

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index 7a94f1f8..fb6edb05 100644
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -552,11 +552,11 @@ static ex f_ginac_function(const exprseq &es, int serial)
 }
 
 // All registered GiNaC functions
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 void GiNaC::ginsh_get_ginac_functions(void)
-#else // ndef NO_GINAC_NAMESPACE
+#else // ndef NO_NAMESPACE_GINAC
 void ginsh_get_ginac_functions(void)
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 {
 	vector<registered_function_info>::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end();
 	unsigned serial = 0;
@@ -722,21 +722,24 @@ static char **fcn_completion(char *text, int start, int end)
 	}
 }
 
+void greeting(void)
+{
+    cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " V" << VERSION << ")" << endl;
+    cout << "  __,  _______  Copyright (C) 1999-2000 Johannes Gutenberg University Mainz,\n"
+         << " (__) *       | Germany.  This is free software with ABSOLUTELY NO WARRANTY.\n"
+         << "  ._) i N a C | You are welcome to redistribute it under certain conditions;\n"
+         << "<-------------' see the file COPYING for details." << endl;
+    cout << "Type ?? for a list of help topics." << endl;
+}
 
 /*
  *  Main program
  */
-
 int main(int argc, char **argv)
 {
 	// Print banner in interactive mode
-	if (isatty(0)) {
-		cout << "ginsh - GiNaC Interactive Shell (" << PACKAGE << " " << VERSION << ")\n";
-		cout << "Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany\n";
-		cout << "This is free software with ABSOLUTELY NO WARRANTY.  You are welcome to\n";
-		cout << "redistribute it under certain conditions; see the file COPYING for details.\n";
-		cout << "Type ?? for a list of help topics.\n";
-	}
+	if (isatty(0)) 
+		greeting();
 
 	// Init function table
 	insert_fcns(builtin_fcns);