Merge pull request #210 from aous72/compilation_fix

aous72 · web-flow · commit d806e58a5e09 · 2025-09-24T01:07:57.000+02:00
This is to fix compilation on MinGW
diff --git a/src/core/common/ojph_mem.h b/src/core/common/ojph_mem.h
@@ -49,7 +49,7 @@
 namespace ojph {
 
   ////////////////////////////////////////////////////////////////////////////
-#ifdef OJPH_COMPILER_MSVC
+#ifdef OJPH_OS_WINDOWS
   inline void* ojph_aligned_malloc(size_t alignment, size_t size)
   {
     return _aligned_malloc(size, alignment);
diff --git a/src/core/common/ojph_version.h b/src/core/common/ojph_version.h
@@ -35,4 +35,4 @@
 
 #define OPENJPH_VERSION_MAJOR 0
 #define OPENJPH_VERSION_MINOR 24
-#define OPENJPH_VERSION_PATCH 0
+#define OPENJPH_VERSION_PATCH 1

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`namespace ojph {`
`50`	`50`
`51`	`51`	`////////////////////////////////////////////////////////////////////////////`
`52`		`-#ifdef OJPH_COMPILER_MSVC`
	`52`	`+#ifdef OJPH_OS_WINDOWS`
`53`	`53`	`inline void* ojph_aligned_malloc(size_t alignment, size_t size)`
`54`	`54`	`{`
`55`	`55`	`return _aligned_malloc(size, alignment);`