From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Dec 2011 23:12:54 +0000 (-0800)
Subject: Merge branch 'vr/msvc'
X-Git-Tag: v1.7.9-rc0~96
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd17abdf75207e01bb716c2c7c9f62e56f2f0fdb?ds=inline;hp=-c

Merge branch 'vr/msvc'

* vr/msvc:
MSVC: Remove unneeded header stubs
Compile fix for MSVC: Include <io.h>
Compile fix for MSVC: Do not include sys/resources.h
---

cd17abdf75207e01bb716c2c7c9f62e56f2f0fdb
diff --combined git-compat-util.h
index 230e198fc3,53186dacbb..77062ed2a6
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -116,7 -116,12 +116,12 @@@
  #else
  #include <poll.h>
  #endif
- #ifndef __MINGW32__
+ #if defined(__MINGW32__)
+ /* pull in Windows compatibility stuff */
+ #include "compat/mingw.h"
+ #elif defined(_MSC_VER)
+ #include "compat/msvc.h"
+ #else
  #include <sys/wait.h>
  #include <sys/resource.h>
  #include <sys/socket.h>
@@@ -145,12 -150,6 +150,6 @@@
  #include <grp.h>
  #define _ALL_SOURCE 1
  #endif
- #else 	/* __MINGW32__ */
- /* pull in Windows compatibility stuff */
- #include "compat/mingw.h"
- #endif	/* __MINGW32__ */
- #ifdef _MSC_VER
- #include "compat/msvc.h"
  #endif
  
  #ifndef NO_LIBGEN_H
@@@ -219,7 -218,7 +218,7 @@@ extern char *gitbasename(char *)
  #define find_last_dir_sep(path) strrchr(path, '/')
  #endif
  
 -#if __HP_cc >= 61000
 +#if defined(__HP_cc) && (__HP_cc >= 61000)
  #define NORETURN __attribute__((noreturn))
  #define NORETURN_PTR
  #elif defined(__GNUC__) && !defined(NO_NORETURN)
@@@ -351,8 -350,6 +350,8 @@@ extern size_t gitstrlcpy(char *, const 
  #ifdef NO_STRTOUMAX
  #define strtoumax gitstrtoumax
  extern uintmax_t gitstrtoumax(const char *, char **, int);
 +#define strtoimax gitstrtoimax
 +extern intmax_t gitstrtoimax(const char *, char **, int);
  #endif
  
  #ifdef NO_STRTOK_R