Cleanup rebase mess

gap-system · Mar 30, 2017 · 0e063b4 · 0e063b4
1 parent 6ae7d82
commit 0e063b4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/src/gap.c b/src/gap.c
@@ -3285,7 +3285,6 @@ void InitializeGap (
 
     JumpToCatchFunc = 0;
 
-    sysargv = argv;
     sysenviron = environ;
 
     /* get info structures for the build in modules                        */

diff --git a/src/sage_interface.c b/src/sage_interface.c
@@ -114,7 +114,7 @@ char* libgap_get_error()
 
 void libgap_finish_interaction()
 {
-  while (Symbol != S_EOF)
+  while (TLS(Symbol) != S_EOF)
     GetSymbol();
   stdin_buffer = NULL;
 

diff --git a/src/scanner.c b/src/scanner.c
@@ -2427,6 +2427,7 @@ void PutChrTo (
 
     }
 }
+#endif
 
 /****************************************************************************
  **

diff --git a/src/sysfiles.c b/src/sysfiles.c
@@ -2891,6 +2891,7 @@ Char * SyFgets (
     return libgap_get_input(line, length);
     // return syFgets( line, length, fid, 1);
 #endif
+}
 
 Char *SyFgetsSemiBlock (
     Char *              line,