===================================================================
RCS file: /home/cvs/OpenXM_contrib2/fep/fep_hist.c,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- OpenXM_contrib2/fep/fep_hist.c	2002/09/03 00:41:44	1.1
+++ OpenXM_contrib2/fep/fep_hist.c	2019/12/13 15:41:36	1.6
@@ -2,20 +2,25 @@
 
 #ifndef lint
 static char rcsid[]=
-"$Header: /home/cvs/OpenXM_contrib2/fep/fep_hist.c,v 1.1 2002/09/03 00:41:44 noro Exp $ (SRA)";
+"$Header: /home/cvs/OpenXM_contrib2/fep/fep_hist.c,v 1.6 2019/12/13 15:41:36 fujimoto Exp $ (SRA)";
 #endif /* lint */
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <ctype.h>
 #include "fep_defs.h"
 #include "fep_glob.h"
 #include "fep_funcs.h"
 
-#if defined(__FreeBSD__) || defined(__CYGWIN__)
-#define re_comp regcomp
-#define re_exec regexec
+#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__APPLE_CC__) || defined(__INTERIX) || defined(ANDROID)
+#include <regex.h>
+regex_t Re_pat;
+#define re_comp(p) (regcomp(&Re_pat,(p), REG_EXTENDED|REG_NOSUB))
+#define re_exec(p) (!regexec(&Re_pat, (p), 0 , NULL, 0))
+#else
+    char *re_comp();
 #endif
 
 char	**HistoryTable;
@@ -277,7 +282,6 @@ search_reverse_history (string)
     char *string;
 {
     register int i;
-    char *re_comp();
 
     if (string != NULL) {
 	set_var ("search-string", string);
@@ -302,7 +306,6 @@ search_forward_history (string)
     char *string;
 {
     register int i;
-    char *re_comp();
 
     if (string != NULL) {
 	if (re_comp(string) != (char *)0)