kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Win64 fixes for mingw-w64 compilation

This commit is contained in:
Ruben Van Boxem 2010-04-12 22:07:05 +02:00 committed by Bill Hoffman
parent e0acb6ca5f
commit 7883f952b0
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmWin32ProcessExecution.cxx
View File

@ -22,7 +22,8 @@
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
# define STRICMP stricmp # define STRICMP stricmp
# define TO_INTPTR(x) ((long)(x)) # define TO_INTPTR(x) ((long)(x))
#else // Visual studio #endif // Borland
#if defined(_MSC_VER) // Visual studio
# if ( _MSC_VER >= 1300 ) # if ( _MSC_VER >= 1300 )
# include <stddef.h> # include <stddef.h>
# define TO_INTPTR(x) ((intptr_t)(x)) # define TO_INTPTR(x) ((intptr_t)(x))
@ -30,7 +31,12 @@
# define TO_INTPTR(x) ((long)(x)) # define TO_INTPTR(x) ((long)(x))
# endif // Visual studio .NET # endif // Visual studio .NET
# define STRICMP _stricmp # define STRICMP _stricmp
#endif // Borland #endif // Visual Studio
#if defined(__MINGW32__)
# include <stdint.h>
# define TO_INTPTR(x) ((intptr_t)(x))
# define STRICMP _stricmp
#endif // MinGW
#define POPEN_1 1 #define POPEN_1 1
#define POPEN_2 2 #define POPEN_2 2

4
Utilities/cmlibarchive/libarchive/archive_windows.h
View File

@ -296,7 +296,9 @@ struct _timeval64i32 {
#define __timeval _timeval64i32 #define __timeval _timeval64i32
#endif #endif
typedef int pid_t; #if defined(_MSC_VER)
typedef int pid_t;
#endif // _MSC_VER
/* Message digest define */ /* Message digest define */
#if !defined(HAVE_OPENSSL_MD5_H) && !defined(HAVE_OPENSSL_SHA_H) #if !defined(HAVE_OPENSSL_MD5_H) && !defined(HAVE_OPENSSL_SHA_H)