diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-12-05 23:07:06 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-12-05 23:07:06 +0100 |
| commit | e7dd0deb3c4c4b1f55e28e5fe9a4ef4b76951b85 (patch) | |
| tree | 2837cfa9492bb137bf63cbdc0e3794490f6550fb /src | |
| parent | c08ee7476b19f9b4de5df287797af87c4e3fba0a (diff) | |
| download | vim-git-e7dd0deb3c4c4b1f55e28e5fe9a4ef4b76951b85.tar.gz | |
patch 8.1.2397: should not define __USE_XOPENv8.1.2397
Problem: Should not define __USE_XOPEN. _XOPEN_SOURCE is not needed for
Android.
Solution: Remove __USE_XOPEN and adjust #ifdefs. (Ozaki Kiichi,
closes #5322)
Diffstat (limited to 'src')
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/version.c b/src/version.c index f5c7d2e27..f65803944 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2397, +/**/ 2396, /**/ 2395, @@ -36,7 +36,7 @@ Error: configure did not run properly. Check auto/config.log. # endif -# if defined(__gnu_linux__) || defined(__CYGWIN__) +# if (defined(__linux__) && !defined(__ANDROID__)) || defined(__CYGWIN__) // Needed for strptime(). Needs to be done early, since header files can // include other header files and end up including time.h, where these symbols // matter for Vim. @@ -44,9 +44,6 @@ # ifndef _XOPEN_SOURCE # define _XOPEN_SOURCE 700 # endif -# ifndef __USE_XOPEN -# define __USE_XOPEN -# endif # endif // for INT_MAX, LONG_MAX et al. |