Changeset 172d852 in git for kernel/oswrapper/feread.cc

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/feread.cc (modified) (3 diffs)

kernel/oswrapper/feread.cc

@@ -54 +54 @@
 char *command_generator (char *text, int state)
 {
-  static int list_index, len;
-  static idhdl h;
+  STATIC_VAR int list_index, len;
+  STATIC_VAR idhdl h;
   const char *name;
 
@@ -126 +126 @@
   #ifndef READLINE_READLINE_H_OK
     /* declare everything we need explicitely and do not rely on includes */
-    extern char * rl_readline_name;
-    extern char *rl_line_buffer;
+    EXTERN_VAR char * rl_readline_name;
+    EXTERN_VAR char *rl_line_buffer;
     char *rl_filename_completion_function(const char*, int);
     typedef char **CPPFunction ();
 
     extern char ** rl_completion_matches (const char*, RL_PROC);
-    extern CPPFunction * rl_attempted_completion_function;
-    extern FILE * rl_outstream;
+    EXTERN_VAR CPPFunction * rl_attempted_completion_function;
+    EXTERN_VAR FILE * rl_outstream;
     extern char * readline (const char *);
     extern void add_history (char *);
@@ -164 +164 @@
   char *(*fe_filename_completion_function)(); /* 3 */
   char *(* fe_readline) (char *);             /* 4 */
-  void (*fe_add_history) (char *);            /* 5 */
-  char ** fe_rl_readline_name;                /* 6 */
-  char **fe_rl_line_buffer;                   /* 7 */
+  VAR void (*fe_add_history) (char *);            /* 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) (char *);            /* 14 */
+  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) (char *);            /* 14 */
 
 }