From 7883f952b06e378eef7662a42a8c466cbe5aa285 Mon Sep 17 00:00:00 2001 From: Ruben Van Boxem Date: Mon, 12 Apr 2010 22:07:05 +0200 Subject: Win64 fixes for mingw-w64 compilation --- Source/cmWin32ProcessExecution.cxx | 10 ++++++++-- Utilities/cmlibarchive/libarchive/archive_windows.h | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Source/cmWin32ProcessExecution.cxx b/Source/cmWin32ProcessExecution.cxx index c8b4ae4..d9bd26c 100644 --- a/Source/cmWin32ProcessExecution.cxx +++ b/Source/cmWin32ProcessExecution.cxx @@ -22,7 +22,8 @@ #if defined(__BORLANDC__) # define STRICMP stricmp # define TO_INTPTR(x) ((long)(x)) -#else // Visual studio +#endif // Borland +#if defined(_MSC_VER) // Visual studio # if ( _MSC_VER >= 1300 ) # include # define TO_INTPTR(x) ((intptr_t)(x)) @@ -30,7 +31,12 @@ # define TO_INTPTR(x) ((long)(x)) # endif // Visual studio .NET # define STRICMP _stricmp -#endif // Borland +#endif // Visual Studio +#if defined(__MINGW32__) +# include +# define TO_INTPTR(x) ((intptr_t)(x)) +# define STRICMP _stricmp +#endif // MinGW #define POPEN_1 1 #define POPEN_2 2 diff --git a/Utilities/cmlibarchive/libarchive/archive_windows.h b/Utilities/cmlibarchive/libarchive/archive_windows.h index 4b09fc7..9ded13a 100644 --- a/Utilities/cmlibarchive/libarchive/archive_windows.h +++ b/Utilities/cmlibarchive/libarchive/archive_windows.h @@ -296,7 +296,9 @@ struct _timeval64i32 { #define __timeval _timeval64i32 #endif -typedef int pid_t; +#if defined(_MSC_VER) + typedef int pid_t; +#endif // _MSC_VER /* Message digest define */ #if !defined(HAVE_OPENSSL_MD5_H) && !defined(HAVE_OPENSSL_SHA_H) -- cgit v0.12