From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Apr 2012 20:01:42 +0000 (-0700)
Subject: Merge branch 'rj/mingw-isguid'
X-Git-Tag: v1.7.11-rc0~119
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e7779c2eca417c0defd3cd8ad249b0b9cfc66d85?ds=inline;hp=-c

Merge branch 'rj/mingw-isguid'

By Ramsay Jones
* rj/mingw-isguid:
compat/mingw.h: Set S_ISUID to prevent a fast-import test failure
---

e7779c2eca417c0defd3cd8ad249b0b9cfc66d85
diff --combined compat/mingw.h
index ef5b15014e,dcd1f6b581..61a652138a
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@@ -22,9 -22,10 +22,10 @@@ typedef int socklen_t
  #define S_IWOTH 0
  #define S_IXOTH 0
  #define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH)
- #define S_ISUID 0
- #define S_ISGID 0
- #define S_ISVTX 0
+ 
+ #define S_ISUID 0004000
+ #define S_ISGID 0002000
+ #define S_ISVTX 0001000
  
  #define WIFEXITED(x) 1
  #define WIFSIGNALED(x) 0
@@@ -274,9 -275,9 +275,9 @@@ int mingw_utime(const char *file_name, 
  pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
  		     const char *dir,
  		     int fhin, int fhout, int fherr);
 -void mingw_execvp(const char *cmd, char *const *argv);
 +int mingw_execvp(const char *cmd, char *const *argv);
  #define execvp mingw_execvp
 -void mingw_execv(const char *cmd, char *const *argv);
 +int mingw_execv(const char *cmd, char *const *argv);
  #define execv mingw_execv
  
  static inline unsigned int git_ntohl(unsigned int x)