From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Nov 2018 13:37:20 +0000 (+0900)
Subject: Merge branch 'js/mingw-isatty-and-dup2'
X-Git-Tag: v2.20.0-rc0~51
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fbfdc07511283a111192e32970bee909016b47d2?ds=inline;hp=-c

Merge branch 'js/mingw-isatty-and-dup2'

Windows fix.

* js/mingw-isatty-and-dup2:
mingw: fix isatty() after dup2()
---

fbfdc07511283a111192e32970bee909016b47d2
diff --combined compat/mingw.h
index 4c14e30835,b04556ce0e..a577df0d74
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@@ -327,41 -327,18 +327,41 @@@ static inline int getrlimit(int resourc
  }
  
  /*
 - * Use mingw specific stat()/lstat()/fstat() implementations on Windows.
 + * Use mingw specific stat()/lstat()/fstat() implementations on Windows,
 + * including our own struct stat with 64 bit st_size and nanosecond-precision
 + * file times.
   */
  #ifndef __MINGW64_VERSION_MAJOR
  #define off_t off64_t
  #define lseek _lseeki64
 +struct timespec {
 +	time_t tv_sec;
 +	long tv_nsec;
 +};
  #endif
  
 -/* use struct stat with 64 bit st_size */
 +struct mingw_stat {
 +    _dev_t st_dev;
 +    _ino_t st_ino;
 +    _mode_t st_mode;
 +    short st_nlink;
 +    short st_uid;
 +    short st_gid;
 +    _dev_t st_rdev;
 +    off64_t st_size;
 +    struct timespec st_atim;
 +    struct timespec st_mtim;
 +    struct timespec st_ctim;
 +};
 +
 +#define st_atime st_atim.tv_sec
 +#define st_mtime st_mtim.tv_sec
 +#define st_ctime st_ctim.tv_sec
 +
  #ifdef stat
  #undef stat
  #endif
 -#define stat _stati64
 +#define stat mingw_stat
  int mingw_lstat(const char *file_name, struct stat *buf);
  int mingw_stat(const char *file_name, struct stat *buf);
  int mingw_fstat(int fd, struct stat *buf);
@@@ -374,6 -351,13 +374,6 @@@
  #endif
  #define lstat mingw_lstat
  
 -#ifndef _stati64
 -# define _stati64(x,y) mingw_stat(x,y)
 -#elif defined (_USE_32BIT_TIME_T)
 -# define _stat32i64(x,y) mingw_stat(x,y)
 -#else
 -# define _stat64(x,y) mingw_stat(x,y)
 -#endif
  
  int mingw_utime(const char *file_name, const struct utimbuf *times);
  #define utime mingw_utime
@@@ -406,6 -390,9 +406,9 @@@ int mingw_raise(int sig)
  int winansi_isatty(int fd);
  #define isatty winansi_isatty
  
+ int winansi_dup2(int oldfd, int newfd);
+ #define dup2 winansi_dup2
+ 
  void winansi_init(void);
  HANDLE winansi_get_osfhandle(int fd);