Author: post
Date: 2013-10-27 20:07:34 +0100 (Sun, 27 Oct 2013)
New Revision: 605
Modified:
RawSpeed/Common.cpp
RawSpeed/Common.h
Log:
MingW has _aligned_mallec & free. Thanks to Tobias Ellinghaus.
Modified: RawSpeed/Common.cpp
===================================================================
--- RawSpeed/Common.cpp 2013-10-27 19:04:05 UTC (rev 604)
+++ RawSpeed/Common.cpp 2013-10-27 19:07:34 UTC (rev 605)
@@ -47,7 +47,7 @@
return malloc(bytes); // Mac OS X malloc is usually aligned to 16 bytes
}
-#elif defined(__unix__) || defined(__MINGW32__)
+#elif defined(__unix__)
void* _aligned_malloc(size_t bytes, size_t alignment) {
void* ret= NULL;
Modified: RawSpeed/Common.h
===================================================================
--- RawSpeed/Common.h 2013-10-27 19:04:05 UTC (rev 604)
+++ RawSpeed/Common.h 2013-10-27 19:07:34 UTC (rev 605)
@@ -38,8 +38,6 @@
#define _RPT4(a,b,c,d,e,f)
#define __inline inline
#define _strdup(a) strdup(a)
-void* _aligned_malloc(size_t bytes, size_t alignment);
-#define _aligned_free(a) do { free(a); } while (0)
#ifndef MIN
#define MIN(a, b) lmin(a,b)
#endif
@@ -48,6 +46,8 @@
#endif
typedef unsigned long long uint64;
#ifndef __MINGW32__
+void* _aligned_malloc(size_t bytes, size_t alignment);
+#define _aligned_free(a) do { free(a); } while (0)
typedef char* LPCWSTR;
#endif
#endif // __unix__
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
