diff options
| author | Joe Rayhawk <jrayhawk@fairlystable.org> | 2025-04-30 02:07:56 -0700 |
|---|---|---|
| committer | Joe Rayhawk <jrayhawk@fairlystable.org> | 2025-04-30 02:07:56 -0700 |
| commit | 26e09889646be3ea65b4a3dfeda26213e4bb6a27 (patch) | |
| tree | 4f3c73a9416bf47ad7e125383d23cf42879e38d7 /Src/zsh_system.h | |
| parent | 841bce705a58b04220b1f257abcc00ae71cbdbdc (diff) | |
| parent | 001cba48ce3b964cf01fb3e2af54b20eacbc9bf5 (diff) | |
| download | zsh-26e09889646be3ea65b4a3dfeda26213e4bb6a27.tar.gz zsh-26e09889646be3ea65b4a3dfeda26213e4bb6a27.zip | |
Merge branch 'upstream' into debian
Diffstat (limited to 'Src/zsh_system.h')
| -rw-r--r-- | Src/zsh_system.h | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/Src/zsh_system.h b/Src/zsh_system.h index 6f4efce96..21446a9b1 100644 --- a/Src/zsh_system.h +++ b/Src/zsh_system.h @@ -82,12 +82,6 @@ */ #define _STRPTIME_DONTZERO -#ifdef PROTOTYPES -# define _(Args) Args -#else -# define _(Args) () -#endif - #ifndef HAVE_ALLOCA # define alloca zhalloc #else @@ -101,7 +95,7 @@ # pragma alloca # else # ifndef alloca -char *alloca _((size_t)); +char *alloca (size_t); # endif # endif # endif @@ -375,8 +369,6 @@ struct timespec { # ifndef TIME_H_SELECT_H_CONFLICTS # include <sys/select.h> # endif -#elif defined(SELECT_IN_SYS_SOCKET_H) -# include <sys/socket.h> #endif #if defined(__APPLE__) && defined(HAVE_SELECT) @@ -783,7 +775,8 @@ extern char **environ; * We always need setenv and unsetenv in pairs, because * we don't know how to do memory management on the values set. */ -#if defined(HAVE_SETENV) && defined(HAVE_UNSETENV) && !defined(__APPLE__) +#if defined(HAVE_SETENV) && defined(HAVE_UNSETENV) \ + && !defined(SETENV_MANGLES_EQUAL) # define USE_SET_UNSET_ENV #endif @@ -808,16 +801,6 @@ extern short ospeed; #endif #endif -/* Can't support job control without working tcsetgrp() */ -#ifdef BROKEN_TCSETPGRP -#undef JOB_CONTROL -#endif /* BROKEN_TCSETPGRP */ - -#ifdef BROKEN_KILL_ESRCH -#undef ESRCH -#define ESRCH EINVAL -#endif /* BROKEN_KILL_ESRCH */ - /* Can we do locale stuff? */ #undef USE_LOCALE #if defined(CONFIG_LOCALE) && defined(HAVE_SETLOCALE) && defined(LC_ALL) |