From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jul 2014 18:18:50 +0000 (-0700)
Subject: Merge branch 'sk/mingw-uni-fix'
X-Git-Tag: v2.1.0-rc0~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/80e85754e08da9999f7b7ab956465150aebcf44d?hp=-c

Merge branch 'sk/mingw-uni-fix'

* sk/mingw-uni-fix:
Win32: Unicode file name support (dirent)
Win32: Unicode file name support (except dirent)
---

80e85754e08da9999f7b7ab956465150aebcf44d
diff --combined compat/mingw.h
index 7ff2376335,405c08fcc3..510530c690
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@@ -35,9 -35,6 +35,9 @@@ typedef int socklen_t
  #ifndef EWOULDBLOCK
  #define EWOULDBLOCK EAGAIN
  #endif
 +#ifndef ELOOP
 +#define ELOOP EMLINK
 +#endif
  #define SHUT_WR SD_SEND
  
  #define SIGHUP 1
@@@ -121,10 -118,7 +121,7 @@@ static inline int fcntl(int fd, int cmd
   * simple adaptors
   */
  
- static inline int mingw_mkdir(const char *path, int mode)
- {
- 	return mkdir(path);
- }
+ int mingw_mkdir(const char *path, int mode);
  #define mkdir mingw_mkdir
  
  #define WNOHANG 1
@@@ -195,6 -189,19 +192,19 @@@ FILE *mingw_freopen (const char *filena
  int mingw_fflush(FILE *stream);
  #define fflush mingw_fflush
  
+ int mingw_access(const char *filename, int mode);
+ #undef access
+ #define access mingw_access
+ 
+ int mingw_chdir(const char *dirname);
+ #define chdir mingw_chdir
+ 
+ int mingw_chmod(const char *filename, int mode);
+ #define chmod mingw_chmod
+ 
+ char *mingw_mktemp(char *template);
+ #define mktemp mingw_mktemp
+ 
  char *mingw_getcwd(char *pointer, int len);
  #define getcwd mingw_getcwd