diff options
| author |  Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-03 22:25:13 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-03 22:26:18 +0100 |
| commit | 5740003e06f0c585460501514f3352f5e105c98c (patch) | |
| tree | c70ca6e115f9420e6aab09b72f454d1bc7ad45df | |
| parent | 03632e32eb1d2e8f5d41ddc0f81bc6eff6a343c9 (diff) | |
Simplify code via AC_USE_SYSTEM_EXTENSIONS
`AC_USE_SYSTEM_EXTENSIONS` takes care of defining feature_test_macros(7)
thereby allowing us to remove a few manual `#define`s
| -rw-r--r-- | cbits/dirUtils.c | 11 | ||||
| -rw-r--r-- | cbits/execvpe.c | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | include/HsUnix.h | 4 | ||||
| -rw-r--r-- | include/execvpe.h | 1 |
5 files changed, 3 insertions, 20 deletions
diff --git a/cbits/dirUtils.c b/cbits/dirUtils.c index 6fc0830..0a645eb 100644 --- a/cbits/dirUtils.c +++ b/cbits/dirUtils.c @@ -4,17 +4,6 @@ * Directory Runtime Support */ -/* needed only for solaris2_HOST_OS */ -#ifdef __GLASGOW_HASKELL__ -#include "ghcconfig.h" -#endif - -// The following is required on Solaris to force the POSIX versions of -// the various _r functions instead of the Solaris versions. -#ifdef solaris2_HOST_OS -#define _POSIX_PTHREAD_SEMANTICS -#endif - #include "HsUnix.h" /* diff --git a/cbits/execvpe.c b/cbits/execvpe.c index c27bca9..82e1bdc 100644 --- a/cbits/execvpe.c +++ b/cbits/execvpe.c @@ -11,10 +11,6 @@ #include "HsUnixConfig.h" -#if HAVE_EXECVPE -# define _GNU_SOURCE -#endif - #include <errno.h> #include <sys/types.h> #if HAVE_SYS_WAIT_H diff --git a/configure.ac b/configure.ac index c63b45b..8738680 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,11 @@ AC_INIT([Haskell unix package], [2.0], [libraries@haskell.org], [unix]) +AC_PREREQ([2.60]) # Safety check: Ensure that we are in the correct source directory. AC_CONFIG_SRCDIR([include/HsUnix.h]) +AC_USE_SYSTEM_EXTENSIONS + AC_ARG_WITH([cc], [C compiler], [CC=$withval]) diff --git a/include/HsUnix.h b/include/HsUnix.h index ba3e053..cfdddb4 100644 --- a/include/HsUnix.h +++ b/include/HsUnix.h @@ -19,10 +19,6 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION -#ifdef solaris2_HOST_OS -#define _POSIX_PTHREAD_SEMANTICS -#endif - #include <stdlib.h> #include <stdio.h> diff --git a/include/execvpe.h b/include/execvpe.h index 1fd2fbb..63cd042 100644 --- a/include/execvpe.h +++ b/include/execvpe.h @@ -14,7 +14,6 @@ __hsunix_execvpe(const char *name, char *const argv[], char *const envp[]); #ifndef HSUNIX_EXECVPE_H_NO_COMPAT #include "HsUnixConfig.h" #if HAVE_EXECVPE -# define _GNU_SOURCE # include <unistd.h> extern int execvpe(const char *name, char *const argv[], char *const envp[]); |