summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2006-01-20 11:38:31 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2006-01-20 11:38:31 +0000
commit42dfe0465e03b819a3508d653ce6e7cc39b40cff (patch)
treeb51cc30260d9232d208d0cf724d8f883d63258b4 /libc
parent46755f4c22f38d503c4dfac90d09e78062ff7f80 (diff)
Correction if UNIX98PTY_ONLY is not enabled
Diffstat (limited to 'libc')
-rw-r--r--libc/stdlib/bsd_getpt.c6
-rw-r--r--libc/stdlib/getpt.c7
2 files changed, 8 insertions, 5 deletions
diff --git a/libc/stdlib/bsd_getpt.c b/libc/stdlib/bsd_getpt.c
index aec0ca4bc..9b885c4e5 100644
--- a/libc/stdlib/bsd_getpt.c
+++ b/libc/stdlib/bsd_getpt.c
@@ -22,6 +22,8 @@
#include <string.h>
#include <unistd.h>
+libc_hidden_proto(open)
+libc_hidden_proto(mempcpy)
/* Prefix for master pseudo terminal nodes. */
#define _PATH_PTY "/dev/pty"
@@ -48,7 +50,7 @@ __getpt (void)
const char *p, *q;
char *s;
- s = __mempcpy (buf, _PATH_PTY, sizeof (_PATH_PTY) - 1);
+ s = mempcpy (buf, _PATH_PTY, sizeof (_PATH_PTY) - 1);
/* s[0] and s[1] will be filled in the loop. */
s[2] = '\0';
@@ -62,7 +64,7 @@ __getpt (void)
s[1] = *q;
- fd = __open (buf, O_RDWR);
+ fd = open (buf, O_RDWR);
if (fd != -1)
return fd;
diff --git a/libc/stdlib/getpt.c b/libc/stdlib/getpt.c
index a5fde0fce..7005bee71 100644
--- a/libc/stdlib/getpt.c
+++ b/libc/stdlib/getpt.c
@@ -17,12 +17,16 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#define _GNU_SOURCE
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
#include <paths.h>
+libc_hidden_proto(open)
+libc_hidden_proto(close)
+
#if !defined __ASSUME_DEVPTS__
# include <sys/statfs.h>
@@ -42,9 +46,6 @@
extern int __bsd_getpt (void) attribute_hidden;
#endif
-libc_hidden_proto(open)
-libc_hidden_proto(close)
-
/* Open a master pseudo terminal and return its file descriptor. */
int
getpt (void)