diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-05-04 18:43:01 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-05-04 18:43:01 +0000 |
| commit | bb8ec071e303f0c89549a676ec0bdbaaea707567 (patch) | |
| tree | b52b2956eefa9f5ec9e6059cbc0926fd77a12268 /Src/system.h | |
| parent | 24915: some more fix-ups for combining characters (diff) | |
| download | zsh-bb8ec071e303f0c89549a676ec0bdbaaea707567.tar zsh-bb8ec071e303f0c89549a676ec0bdbaaea707567.tar.gz zsh-bb8ec071e303f0c89549a676ec0bdbaaea707567.tar.bz2 zsh-bb8ec071e303f0c89549a676ec0bdbaaea707567.tar.lz zsh-bb8ec071e303f0c89549a676ec0bdbaaea707567.tar.xz zsh-bb8ec071e303f0c89549a676ec0bdbaaea707567.tar.zst zsh-bb8ec071e303f0c89549a676ec0bdbaaea707567.zip | |
24904 + 24916: be more careful definined _XOPEN_SOURCE_EXTENDED on BSD systems
Diffstat (limited to 'Src/system.h')
| -rw-r--r-- | Src/system.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Src/system.h b/Src/system.h index 2f542981b..8449b1bd6 100644 --- a/Src/system.h +++ b/Src/system.h @@ -52,19 +52,20 @@ # undef HAVE_SYS_UTSNAME_H #endif -#if defined(ZSH_CURSES_SOURCE) && defined(ZSH_CURSES_NEEDS_XOPEN) -# define _XOPEN_SOURCE_EXTENDED 1 -#else -# ifdef MULTIBYTE_SUPPORT +#ifndef ZSH_NO_XOPEN +# ifdef ZSH_CURSES_SOURCE +# define _XOPEN_SOURCE_EXTENDED 1 +# else +# ifdef MULTIBYTE_SUPPORT /* * Needed for wcwidth() which is part of XSI. * Various other uses of the interface mean we can't get away with just * _XOPEN_SOURCE. */ -/*# define _XOPEN_SOURCE 1*/ -# define _XOPEN_SOURCE_EXTENDED 1 -# endif -#endif +# define _XOPEN_SOURCE_EXTENDED 1 +# endif /* MULTIBYTE_SUPPORT */ +# endif /* ZSH_CURSES_SOURCE */ +#endif /* ZSH_NO_XOPEN */ /* * Solaris by default zeroes all elements of the tm structure in |
