summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-04-12 17:20:51 +0200
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-06-15 14:00:36 +0200
commitf503f6a97092a349a8de7fac1cde2ef5b3beaf5b (patch)
treeb3f5a8eadd5168b497cb4b34fa53b356ef17021d
parentab5add209a3a7c8323586ff651e1ca6b7bafe06a (diff)
getpt.c: no need for hidden posix_openpt
Prefer static inline instead of hidden (__bsd_getpt) Signed-off-by: Peter S. Mazinger <ps.m@gmx.net> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--include/stdlib.h1
-rw-r--r--libc/stdlib/bsd_getpt.c2
-rw-r--r--libc/stdlib/getpt.c10
3 files changed, 6 insertions, 7 deletions
diff --git a/include/stdlib.h b/include/stdlib.h
index f0a21697f..354fc6672 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -864,7 +864,6 @@ extern void setkey (__const char *__key) __THROW __nonnull ((1));
#ifdef __USE_XOPEN2K
/* Return a master pseudo-terminal handle. */
extern int posix_openpt (int __oflag) __wur;
-libc_hidden_proto(posix_openpt)
#endif
#ifdef __USE_XOPEN
diff --git a/libc/stdlib/bsd_getpt.c b/libc/stdlib/bsd_getpt.c
index e704e235f..d8c46f591 100644
--- a/libc/stdlib/bsd_getpt.c
+++ b/libc/stdlib/bsd_getpt.c
@@ -40,7 +40,7 @@ const char __libc_ptyname1[] attribute_hidden = PTYNAME1;
const char __libc_ptyname2[] attribute_hidden = PTYNAME2;
/* Open a master pseudo terminal and return its file descriptor. */
-int
+static __inline__ int
__getpt (void)
{
char buf[sizeof (_PATH_PTY) + 2];
diff --git a/libc/stdlib/getpt.c b/libc/stdlib/getpt.c
index 2d8b207d3..adebec737 100644
--- a/libc/stdlib/getpt.c
+++ b/libc/stdlib/getpt.c
@@ -43,12 +43,12 @@ extern __typeof(statfs) __libc_statfs;
#if !defined __UNIX98PTY_ONLY__ && defined __UCLIBC_HAS_GETPT__
/* Prototype for function that opens BSD-style master pseudo-terminals. */
-extern int __bsd_getpt (void) attribute_hidden;
+static __inline__ int __bsd_getpt (void);
#endif
/* Open a master pseudo terminal and return its file descriptor. */
-int
-posix_openpt (int flags)
+static int
+__posix_openpt (int flags)
{
#define have_no_dev_ptmx (1<<0)
#define devpts_mounted (1<<1)
@@ -112,14 +112,14 @@ posix_openpt (int flags)
#endif
return -1;
}
-libc_hidden_def(posix_openpt)
+strong_alias(__posix_openpt,posix_openpt)
#undef have_no_dev_ptmx
#undef devpts_mounted
#if defined __USE_GNU && defined __UCLIBC_HAS_GETPT__
int getpt (void)
{
- return posix_openpt(O_RDWR);
+ return __posix_openpt(O_RDWR);
}
#if !defined __UNIX98PTY_ONLY__ && defined __UCLIBC_HAS_GETPT__