Changeset 114

Timestamp:

06/02/10 03:36:08 (3 years ago)

Author:

faltet

Message:

Fixes for supporting MINGW compiler.

Location:

trunk

Files:

• bench/bench.c (modified) (2 diffs)
• src/blosc.c (modified) (3 diffs)
• src/blosclz.c (modified) (1 diff)
• src/shuffle.c (modified) (1 diff)

trunk/bench/bench.c

@@ -25 +25 @@
 #include <sys/stat.h>
 #include <fcntl.h>
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
   #include <time.h>
 #else
@@ -43 +43 @@
 
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include <windows.h>
 #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)

trunk/src/blosc.c

@@ -20 +20 @@
 #include "shuffle.h"
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
   #include <windows.h>
   #include "stdint-windows.h"
@@ -379 +379 @@
   /* Create temporary area for each thread */
   for (tid = 0; tid < nthreads; tid++) {
-#ifdef _WIN32
+#if defined(_WIN32)
     tmp = (uint8_t *)_aligned_malloc(blocksize, 16);
     tmp2 = (uint8_t *)_aligned_malloc(ebsize, 16);
@@ -412 +412 @@
     tmp = params.tmp[tid];
     tmp2 = params.tmp2[tid];
-#ifdef _WIN32
+#if defined(_WIN32)
     _aligned_free(tmp);
     _aligned_free(tmp2);

trunk/src/blosclz.c

@@ -19 +19 @@
 #include "blosclz.h"
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
   #include <windows.h>
   #include "stdint-windows.h"

trunk/src/shuffle.c

@@ -12 +12 @@
 #include "shuffle.h"
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
   #include <windows.h>
   #include "stdint-windows.h"