diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-14 05:18:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-14 05:18:43 +0300 |
| commit | 8593e8a61807df2579b9e578d46e2285b47b61a7 (patch) | |
| tree | 49de428edbb7b6693c4a74adcbff41ab9309389f /compat/mingw.h | |
| parent | feb9a9b202c12289150de45473846f4272aac1bd (diff) | |
| parent | bb02e7a560de818eac48344717bc52ca51b01908 (diff) | |
Merge branch 'js/mingw-host-cpu'
Windows update.
* js/mingw-host-cpu:
mingw: use a more canonical method to fix the CPU reporting
Diffstat (limited to 'compat/mingw.h')
| -rw-r--r-- | compat/mingw.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 98407744f2..30d9fb3e36 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -6,25 +6,6 @@ typedef _sigset_t sigset_t; #include <winsock2.h> #include <ws2tcpip.h> -#ifdef __MINGW64_VERSION_MAJOR -/* - * In Git for Windows, we cannot rely on `uname -m` to report the correct - * architecture: /usr/bin/uname.exe will report the architecture with which the - * current MSYS2 runtime was built, not the architecture for which we are - * currently compiling (both 32-bit and 64-bit `git.exe` is built in the 64-bit - * Git for Windows SDK). - */ -#undef GIT_HOST_CPU -/* This was figured out by looking at `cpp -dM </dev/null`'s output */ -#if defined(__x86_64__) -#define GIT_HOST_CPU "x86_64" -#elif defined(__i686__) -#define GIT_HOST_CPU "i686" -#else -#error "Unknown architecture" -#endif -#endif - /* MinGW-w64 reports to have flockfile, but it does not actually have it. */ #ifdef __MINGW64_VERSION_MAJOR #undef _POSIX_THREAD_SAFE_FUNCTIONS |