===================================================================
RCS file: /home/cvs/OpenXM_contrib2/fep/fep_main.c,v
retrieving revision 1.9
retrieving revision 1.11
diff -u -p -r1.9 -r1.11
--- OpenXM_contrib2/fep/fep_main.c	2012/05/14 12:52:08	1.9
+++ OpenXM_contrib2/fep/fep_main.c	2019/12/13 15:41:36	1.11
@@ -1,8 +1,14 @@
 /*	Copyright (c) 1987, 1988 by Software Research Associates, Inc.	*/
 
+#if defined(ANDROID)
+#include <strings.h>
+#define index(s,c) strchr(s,c)
+#define rindex(s,c) strrchr(s,c)
+#endif
+
 #ifndef lint
 static char rcsid[]=
-"$Id: fep_main.c,v 1.9 2012/05/14 12:52:08 ohara Exp $ (SRA)";
+"$Id: fep_main.c,v 1.11 2019/12/13 15:41:36 fujimoto Exp $ (SRA)";
 #endif /* lint */
 
 #include <stdio.h>
@@ -248,7 +254,11 @@ DEFAULT:
      * Set variable of command name.
      */
     {
+#if defined(ANDROID)
+	char *cp = argv[1];
+#else
 	char *cp = argv[1], *rindex();
+#endif
 
 	if (any ('/', cp))
 	    cp = rindex (cp, '/') + 1;
@@ -868,7 +878,7 @@ get_pty_master()
 	master = 1;
 	return;
     }
-#if defined(__CYGWIN32__) || defined(__linux__)
+#if defined(__CYGWIN32__) || defined(__linux__) || defined(__APPLE__)
     sprintf (master_tty, "/dev/ptmx");
     master = open (master_tty, O_RDWR);
     if (master >= 0) {
@@ -877,6 +887,14 @@ get_pty_master()
 	grantpt(master);
 	unlockpt(master);
 	if ( !ptsname_r(master,name,sizeof(name)) ) {
+	    strcpy(slave_tty, name);
+	    goto FOUND;
+	}
+#elif defined(__APPLE__)
+        char *name;
+	grantpt(master);
+	unlockpt(master);
+	if ( name = (char *)ptsname(master) ) {
 	    strcpy(slave_tty, name);
 	    goto FOUND;
 	}