Changeset 172d852 in git for kernel/oswrapper/fereadl.c

Timestamp:

Jan 24, 2019, 2:32:29 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

08394f319ba420091cccad7e025c3f7cac04c373

Parents:

5abb79fd2458b47b21d297f2c8b26f285ac9546f756676ef1fcf4cff300fb1607a6d21293b253245

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-01-24 14:32:29+01:00

git-committer:

GitHub <noreply@github.com>2019-01-24 14:32:29+01:00

Message:

Merge pull request #906 from rbehrends/prelim-thread-rewrite

Singular changes for multi-threading support.

File:

• kernel/oswrapper/fereadl.c (modified) (4 diffs)

kernel/oswrapper/fereadl.c

@@ -57 +57 @@
 #define feCTRL(C) ((C) & 0x1F)    /* <ctrl> character  */
 
-struct termios fe_saved_attributes;
-
-static BOOLEAN fe_stdout_is_tty;
-static BOOLEAN fe_stdin_is_tty;
-BOOLEAN fe_use_fgets=FALSE;
-static BOOLEAN fe_is_initialized=FALSE;
-
-FILE *  fe_echo; /*the output file for echoed characters*/
+VAR struct termios fe_saved_attributes;
+
+STATIC_VAR BOOLEAN fe_stdout_is_tty;
+STATIC_VAR BOOLEAN fe_stdin_is_tty;
+VAR BOOLEAN fe_use_fgets=FALSE;
+STATIC_VAR BOOLEAN fe_is_initialized=FALSE;
+
+VAR FILE *  fe_echo; /*the output file for echoed characters*/
 
 #define fe_hist_max 32
-char ** fe_hist=NULL;
-short   fe_hist_pos;
-BOOLEAN fe_is_raw_tty=0;
-short   fe_cursor_pos; /* 0..colmax-1*/
-short   fe_cursor_line; /* 0..pagelength-1*/
+VAR char ** fe_hist=NULL;
+VAR short   fe_hist_pos;
+VAR BOOLEAN fe_is_raw_tty=0;
+VAR short   fe_cursor_pos; /* 0..colmax-1*/
+VAR short   fe_cursor_line; /* 0..pagelength-1*/
 
 #ifndef HAVE_ATEXIT
@@ -131 +131 @@
 }
 
-static char termcap_buff[2048];
+STATIC_VAR char termcap_buff[2048];
 static int fe_out_char(int c)
 {
@@ -197 +197 @@
     {
       #ifndef __CYGWIN__
-      extern char *BC;
-      extern char *UP;
-      extern char PC;
+      EXTERN_VAR char *BC;
+      EXTERN_VAR char *UP;
+      EXTERN_VAR char PC;
       #endif
       /* OB: why this ? HS: char t_buf[128] does not work with glibc2 systems */
@@ -713 +713 @@
   char *(*fe_filename_completion_function)(); /* 3 */
   char *(* fe_readline) ();                   /* 4 */
-  void (*fe_add_history) ();                  /* 5 */
-  char ** fe_rl_readline_name;                /* 6 */
-  char **fe_rl_line_buffer;                   /* 7 */
+  VAR void (*fe_add_history) ();                  /* 5 */
+  VAR char ** fe_rl_readline_name;                /* 6 */
+  VAR char **fe_rl_line_buffer;                   /* 7 */
   char **(*fe_completion_matches)();          /* 8 */
-  CPPFunction **fe_rl_attempted_completion_function; /* 9 */
-  FILE ** fe_rl_outstream;                    /* 10 */
-  int (*fe_write_history) ();                 /* 11 */
-  int (*fe_history_total_bytes) ();           /* 12 */
-  void (*fe_using_history) ();                /* 13 */
-  int (*fe_read_history) ();                  /* 14 */
-
-void * fe_rl_hdl=NULL;
+  VAR CPPFunction **fe_rl_attempted_completion_function; /* 9 */
+  VAR FILE ** fe_rl_outstream;                    /* 10 */
+  VAR int (*fe_write_history) ();                 /* 11 */
+  VAR int (*fe_history_total_bytes) ();           /* 12 */
+  VAR void (*fe_using_history) ();                /* 13 */
+  VAR int (*fe_read_history) ();                  /* 14 */
+
+VAR void * fe_rl_hdl=NULL;
 
 char *command_generator (char *text, int state);