initflag/raw_image cleanups

7 files changed, 5 insertions, 17 deletions

diff --git a/gcl/h/att_ext.h b/gcl/h/att_ext.h
index 99d03590..3f527d52 100755
--- a/gcl/h/att_ext.h
+++ b/gcl/h/att_ext.h
@@ -289,7 +289,7 @@ EXTER object sSAsystem_directoryA;
 EXTER char *kcl_self;
 #endif
 #if !defined(IN_MAIN) || !defined(ATT)
-EXTER bool initflag,raw_image;
+EXTER bool raw_image;
 #endif
 char *merge_system_directory();
 
diff --git a/gcl/h/gnuwin95.h b/gcl/h/gnuwin95.h
index 3145467d..864aed60 100755
--- a/gcl/h/gnuwin95.h
+++ b/gcl/h/gnuwin95.h
@@ -19,8 +19,7 @@ extern DBEGIN_TY _dbegin;
 /* size to use for mallocs done  */
 /* #define BABY_MALLOC_SIZE 0x5000 */
 
-/* #define RECREATE_HEAP if (initflag) recreate_heap(argv[0]); */
-/* #define RECREATE_HEAP if (initflag) recreate_heap1(); */
+#define RECREATE_HEAP recreate_heap1();
 
 #ifdef IN_UNIXTIME
 #undef ATT
diff --git a/gcl/h/mingw.h b/gcl/h/mingw.h
index 48de4d37..bf7bb387 100755
--- a/gcl/h/mingw.h
+++ b/gcl/h/mingw.h
@@ -124,7 +124,7 @@ extern DBEGIN_TY _stacktop, _stackbottom, _dbegin;
 /* use the slightly older unexec */
 #define UNIXSAVE "unexnt.c"
     
-#define RECREATE_HEAP if (initflag) { recreate_heap1(); \
+#define RECREATE_HEAP { recreate_heap1(); \
      terminal_io->sm.sm_object1->sm.sm_fp=stdout; \
      terminal_io->sm.sm_object0->sm.sm_fp=stdin; \
      init_shared_memory();}
diff --git a/gcl/h/notcomp.h b/gcl/h/notcomp.h
index be9bc80e..2a76ba40 100755
--- a/gcl/h/notcomp.h
+++ b/gcl/h/notcomp.h
@@ -19,7 +19,7 @@ EXTER int GBC_enable;
 EXTER object sSAnotify_gbcA;
 
 /* symbols which are not needed in compiled lisp code */
-EXTER int interrupt_flag,initflag,interrupt_enable;
+EXTER int interrupt_flag,interrupt_enable;
 void install_default_signals();
 /* void sigint(),sigalrm(); */
 void segmentation_catcher();
diff --git a/gcl/o/alloc.c b/gcl/o/alloc.c
index 9a9d6045..871b6e3f 100644
--- a/gcl/o/alloc.c
+++ b/gcl/o/alloc.c
@@ -74,10 +74,6 @@ struct rlimit data_rlimit;
 #endif
 #endif
 
-#ifdef __CYGWIN__
-void recreate_heap1(void);
-#endif
-
 inline void
 add_page_to_contblock_list(void *p,fixnum m) {
  
diff --git a/gcl/o/main.c b/gcl/o/main.c
index cb90cf54..9e9204e4 100755
--- a/gcl/o/main.c
+++ b/gcl/o/main.c
@@ -74,7 +74,6 @@ char stdin_buf[BUFSIZ + EXTRA_BUFSIZE];
 char stdout_buf[BUFSIZ + EXTRA_BUFSIZE];
 
 int debug;			/* debug switch */
-/* int initflag = FALSE;		/\* initialized flag *\/ */
 int raw_image = TRUE;		/* raw or saved image */
 
 long real_maxpage;
@@ -350,7 +349,7 @@ main(int argc, char **argv, char **envp) {
     set_maxpage();
 
 #ifdef RECREATE_HEAP
-    RECREATE_HEAP
+    if (!raw_image) RECREATE_HEAP
 #endif
 
     setbuf(stdin, stdin_buf); 
@@ -535,7 +534,6 @@ main(int argc, char **argv, char **envp) {
 	    alloc_page(-(holepage + nrbpage));
 	  }
 	  
-	  /* initflag = FALSE; */
 	  GBC_enable = TRUE;
 	  vs_base = vs_top;
 	  ihs_push(Cnil);
@@ -548,7 +546,6 @@ main(int argc, char **argv, char **envp) {
 	  install_default_signals();
 	  
 	  sSAlisp_maxpagesA->s.s_dbind = make_fixnum(real_maxpage);
-	  /* initflag = TRUE; */
 #ifdef KCLOVM
 	  ovm_user_context_change = change_contexts;
 	  ovm_user_context_initialize = initialize_process;
@@ -607,12 +604,9 @@ main(int argc, char **argv, char **envp) {
 
 	lex_new();
 	vs_base = vs_top;
-	/* initflag = TRUE; */
 
 	interrupt_enable = TRUE;
 
-	raw_image=TRUE;
-
 	super_funcall(sStop_level);
 
 	return 0;
diff --git a/gcl/o/unexnt.c b/gcl/o/unexnt.c
index 27a368a4..aa54cc20 100755
--- a/gcl/o/unexnt.c
+++ b/gcl/o/unexnt.c
@@ -110,7 +110,6 @@ void recreate_heap1()
       printf ("Failed to find path for executable.\n");
       exit (1);
     }
-
     recreate_heap (executable_path);
   }
   heap_state = HEAP_LOADED;