author | Junio C Hamano <gitster@pobox.com> | |
Mon, 5 Dec 2011 23:12:54 +0000 (15:12 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 5 Dec 2011 23:12:54 +0000 (15:12 -0800) |
* vr/msvc:
MSVC: Remove unneeded header stubs
Compile fix for MSVC: Include <io.h>
Compile fix for MSVC: Do not include sys/resources.h
MSVC: Remove unneeded header stubs
Compile fix for MSVC: Include <io.h>
Compile fix for MSVC: Do not include sys/resources.h
1 | 2 | |||
---|---|---|---|---|
git-compat-util.h | patch | | diff1 | | diff2 | | blob | history |
diff --combined git-compat-util.h
index 230e198fc35390fbccb496d2b74425382439dc4a,53186dacbb298a685a3a8a8037478a3bbe9a2a2e..77062ed2a66e1efda60ead8ce99abedc8d04ce71
--- 1/git-compat-util.h
--- 2/git-compat-util.h
+++ b/git-compat-util.h
#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>
#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
#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)
#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