remove FISHER ifdefs (#879)

seem to be connected to RCS
neuronsimulator · Dec 23, 2020 · 8764dc4 · 8764dc4
1 parent 35ed397
commit 8764dc4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 58 deletions.
diff --git a/src/nrnoc/cabcode.c b/src/nrnoc/cabcode.c
@@ -2403,32 +2403,6 @@ void push_section(void) {
 }
 
 
-#if FISHER
-void assign_hoc_str(char* str, char* val, int global) 
-
-    /* Assign hoc string in global dataspace if global == 1,
-       else use current dataspace. */
-
-{
-    Symbol *sym;
-    char** pstr;
-    Objectdata* obdsave = hoc_objectdata; /* save current dataspace */
-
-    if (!global && hoc_thisobject) {
-    	sym = hoc_table_lookup(str, hoc_thisobject->template->symtable);
-    }else{
-	hoc_objectdata = hoc_top_level_data;
-	sym = hoc_lookup(str);
-    }
-    if (sym && sym->type == STRING) {
-	/* point to string */
-	pstr = OPSTR(sym);
-	hoc_assign_str(pstr, val);	
-    }
-    hoc_objectdata = obdsave;
-}
-#endif
-
 Section* nrn_section_exists(char* name, int indx, Object* cell) {
 	Section* sec = (Section*)0;
 	Symbol* sym = (Symbol*)0;

diff --git a/src/nrnoc/init.c b/src/nrnoc/init.c
@@ -98,14 +98,6 @@ extern double hoc_default_dll_loaded_;
 extern int nrn_istty_;
 extern int nrn_nobanner_;
 
-#if FISHER
-#include <stdlib.h>
-#include "fisher.h"
-double id_number;              /* for rcs control, set in setup_id_info() */
-char login_name[20];           /* store user's login for sys.c & rcs.c    */
-char *pipe_filter = "more";    /* allow for running NEURON in emacs       */
-#endif
-
 static HocParmLimits _hoc_parm_limits[] = {
 	"Ra", 1e-6, 1e9,
 	"L", 1e-4, 1e20,
@@ -331,16 +323,6 @@ void hoc_last_init(void)
 #if KEEP_NSEG_PARM
 	{extern int keep_nseg_parm_; keep_nseg_parm_ = 1; }
 #endif
-#if FISHER
-	/* get login_name from 'LOGNAME' */
-	strcpy(login_name, getenv("LOGNAME"));
-
-	if (getenv("CAT_PIPE")) {
-	    pipe_filter = "cat";   /* preferred for emacs environment */
-	} else {
-	    pipe_filter = "more";  /* preferred for xterm environment */
-	}
-#endif
 
 	section_list = hoc_l_newlist();
 

diff --git a/src/nrnoc/neuron.h b/src/nrnoc/neuron.h
@@ -56,7 +56,7 @@ extern void syn_reset(), fsyn(), fsyn_set(), fsyng(), fsyni(); /* sej_synapse.c
 extern void con_reset(), fcon(), fcon_set(), fcong(), fconi(); /* sej_connect.c 	*/
 extern void top2(), dump(), dump_all();                        /* sej_dump.c         */
 
-extern void ptest(); 
+extern void ptest();
 
 /* non-initialized variables */
 double ic;
@@ -69,16 +69,3 @@ double dump_flag, print_flag, graph_flag, gray_flag;
 double fig_flag, timer_flag, stim_flag, view_flag;
 
 #endif
-
-#if FISHER
-extern void rcsdiff_file(), rcs_version(), rcs_co_file();   	/* rcs.c */
-extern void rcs_ci_file(), rcs_view_file();               	/* rcs.c */
-extern void add_version_entry(), save_output_file();          	/* sys.c */
-extern void answer_yes(), file_exist(), dassign(), sassign();  	/* sys.c */
-extern void setup_id_info(), update_id_info();                	/* sys.c */
-
-/* non-initialized variables */
-#if !SEJNOWSKI
-double id_number;                                           	/* sys.c */
-#endif
-#endif