# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1575584104 -3600
# Node ID ba8dc10a2c0db22ff2b3fc5d19297504211e2d2c
# Parent  5c40013d45eed7f0495c759cda7470a05d00e1d4
patch 8.1.2397: should not define __USE_XOPEN

Commit: https://github.com/vim/vim/commit/e7dd0deb3c4c4b1f55e28e5fe9a4ef4b76951b85
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Dec 5 23:07:06 2019 +0100

    patch 8.1.2397: should not define __USE_XOPEN

    Problem:    Should not define __USE_XOPEN. _XOPEN_SOURCE is not needed for
                Android.
    Solution:   Remove __USE_XOPEN and adjust #ifdefs. (Ozaki Kiichi,
                closes #5322)

diff --git a/src/version.c b/src/version.c
--- 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,
diff --git a/src/vim.h b/src/vim.h
--- a/src/vim.h
+++ b/src/vim.h
@@ -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.