Ver código fonte

Win64 fixes for mingw-w64 compilation

Ruben Van Boxem 15 anos atrás
pai
commit
7883f952b0

+ 8 - 2
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 <stddef.h>
 #    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 <stdint.h>
+# define TO_INTPTR(x) ((intptr_t)(x))
+# define STRICMP _stricmp
+#endif // MinGW
 
 #define POPEN_1 1
 #define POPEN_2 2

+ 3 - 1
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)