Convert to hidden_def

libutil/forkpty.c

@@ -17,15 +17,15 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define openpty __openpty
-#define login_tty __login_tty
-
 #include <sys/types.h>
 #include <termios.h>
 #include <unistd.h>
 #include <utmp.h>
 #include <pty.h>
 
+libutil_hidden_proto(openpty)
+libutil_hidden_proto(login_tty)
+
 int
 forkpty (amaster, name, termp, winp)
      int *amaster;

libutil/login_tty.c

@@ -36,7 +36,8 @@
 #include <fcntl.h>
 #include <utmp.h>
 
-int attribute_hidden __login_tty(int fd)
+libutil_hidden_proto(login_tty)
+int login_tty(int fd)
 {
 	(void) setsid();
 #ifdef TIOCSCTTY
@@ -67,5 +68,4 @@ int attribute_hidden __login_tty(int fd)
 		(void) close(fd);
 	return (0);
 }
-
-strong_alias(__login_tty,login_tty)
+libutil_hidden_def(login_tty)

libutil/openpty.c

@@ -17,6 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define _GNU_SOURCE
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -27,11 +28,6 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-extern int getpt (void);
-extern int grantpt (int fd);
-extern int ptsname_r (int fd, char *buf, size_t buflen);
-extern int unlockpt (int fd);
-
 /* BCS: the following function is, IMO, overkill */
 #if 0
 /* Return the result of ptsname_r in the buffer pointed to by PTS,
@@ -90,8 +86,9 @@ pts_name (int fd, char **pts, size_t buf_len)
 /* Create pseudo tty master slave pair and set terminal attributes
    according to TERMP and WINP.  Return handles for both ends in
    AMASTER and ASLAVE, and return the name of the slave end in NAME.  */
-int attribute_hidden
-__openpty (int *amaster, int *aslave, char *name, struct termios *termp,
+libutil_hidden_proto(openpty)
+int
+openpty (int *amaster, int *aslave, char *name, struct termios *termp,
 	 struct winsize *winp)
 {
 #if 0
@@ -158,5 +155,4 @@ __openpty (int *amaster, int *aslave, char *name, struct termios *termp,
   close (master);
   return -1;
 }
-
-strong_alias(__openpty,openpty)
+libutil_hidden_def(openpty)