Changeset cc7302 in git

Timestamp:

Aug 11, 2011, 3:21:35 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

2bc4f5a0399eb703dcb16b05ba2872985f7cafc6

Parents:

320f1c493166188f02c725a08142ac1ff60c6d6b

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-11 15:21:35+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:19:16+01:00

Message:

ADD: expose feStringAppendBrowsers (moved to Singular/fehelp.*)

Files:

• Singular/fehelp.cc (modified) (2 diffs)
• Singular/fehelp.h (modified) (1 diff)
• Singular/misc_ip.cc (modified) (1 diff)
• kernel/old.febase.h (modified) (1 diff)

Singular/fehelp.cc

@@ -15 +15 @@
 
 #include <kernel/mod2.h>
+
+#include <omalloc/omalloc.h>
 #include <omalloc/mylimits.h>
-#include <Singular/tok.h>
-#include <omalloc/omalloc.h>
+
 #include <kernel/febase.h>
-#include <Singular/ipid.h>
-#include <Singular/ipshell.h>
-#include <Singular/libparse.h>
-#include <Singular/feOpt.h>
 #include <reporter/reporter.h>
 
+#include "ipid.h"
+#include "ipshell.h"
+#include "libparse.h"
+#include "feOpt.h"
+
+#include "tok.h"
 #include "fehelp.h"
 
@@ -78 +81 @@
 static void heWinHelp(heEntry hentry,int);
 static void heWinHtmlHelp(heEntry hentry,int);
-#include <Singular/sing_win.h>
+#include "sing_win.h"
 #endif
 

Singular/fehelp.h

@@ -2 +2 @@
 #define FEHELP_H
 
+
+/*****************************************************************
+ *
+ * help system (fehelp.cc)
+ *
+ *****************************************************************/
+// if str != NULL display help for str
+// display general help, otherwise
 void feHelp(char* str = NULL);
-const char* feHelpBrowser(char* which=NULL, int warn=-1);
+// if browser != NULL or feOpt("browser") != NULL
+//    set HelpBrowser to browser
+// otherwise, if browser was already set, leave as is,
+//            if not, choose first available browser
+// return string identifying current browser
+// keeps feOpt("browser") up-to-date
+// Optional warn argument is as in feResource
+const char* feHelpBrowser(char* browser = NULL, int warn = -1);
+
+void feStringAppendBrowsers(int warn = -1);
 
 #endif /*  FEHELP_H */

Singular/misc_ip.cc

@@ -354 +354 @@
 #include "static.h"
 
+#include "fehelp.h"
+
 #ifdef HAVE_STATIC
 #undef HAVE_DYN_RL

kernel/old.febase.h

@@ -212 +212 @@
 };
 
-/*****************************************************************
- *
- * help system (fehelp.cc)
- *
- *****************************************************************/
-// if str != NULL display help for str
-// display general help, otherwise
-void feHelp(char* str = NULL);
-// if browser != NULL or feOpt("browser") != NULL
-//    set HelpBrowser to browser
-// otherwise, if browser was already set, leave as is,
-//            if not, choose first available browser
-// return string identifying current browser
-// keeps feOpt("browser") up-to-date
-// Optional warn argument is as in feResource
-const char* feHelpBrowser(char* browser = NULL, int warn = -1);
-void feStringAppendBrowsers(int warn = -1);
 
 /*****************************************************************