From 2ddf4b2b7bf41f878bc7d8a1afa49126710f524c Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Sun, 31 Jan 2016 00:01:18 +0100 Subject: Avoid redundant prototypes for ptsname(3) et al This is now possible since we now use `AC_USE_SYSTEM_EXTENSIONS`, which indirectly enables _XOPEN_SOURCE --- cbits/HsUnix.c | 9 +++------ include/HsUnix.h | 4 ---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/cbits/HsUnix.c b/cbits/HsUnix.c index e54bccf..09cfc9c 100644 --- a/cbits/HsUnix.c +++ b/cbits/HsUnix.c @@ -35,25 +35,22 @@ int __hsunix_getpwuid_r(uid_t uid, struct passwd *pw, char *buffer, #endif #ifdef HAVE_PTSNAME -// I cannot figure out how to make the definitions of the following -// functions visible in on Linux. But these definitions -// follow the POSIX specs, and everything links and runs. +// On Linux (and others), needs to be included while +// `_XOPEN_SOURCE` is already defined. However, GHCs before GHC 8.0 +// didn't do that yet for CApiFFI, so we need this workaround here. char *__hsunix_ptsname(int fd) { - extern char *ptsname(int); return ptsname(fd); } int __hsunix_grantpt(int fd) { - extern int grantpt(int); return grantpt(fd); } int __hsunix_unlockpt(int fd) { - extern int unlockpt(int); return unlockpt(fd); } #endif diff --git a/include/HsUnix.h b/include/HsUnix.h index 7b404fc..98990b2 100644 --- a/include/HsUnix.h +++ b/include/HsUnix.h @@ -126,10 +126,6 @@ int __hsunix_getpwuid_r(uid_t, struct passwd *, char *, size_t, #endif #ifdef HAVE_PTSNAME -// I cannot figure out how to make the definitions of the following -// functions visible in on Linux. But these definitions -// follow the POSIX specs, and everything links and runs. - char *__hsunix_ptsname(int fd); int __hsunix_grantpt(int fd); int __hsunix_unlockpt(int fd); -- cgit v1.2.3