Fin compiler warnings

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1856a0b33f3fbafce74466dabd06ded249a0d7e9..b014a00fd7e81c02bfbef5c5e843f37449b0f393 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,14 +227,14 @@ OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
 
 # Allocating Aligned Memory Blocks
 include(CheckIncludeFiles)
-check_include_files(malloc.h HAVE_MALLOC_H)
+check_include_files(malloc.h OPJ_HAVE_MALLOC_H)
 include(CheckSymbolExists)
 # _aligned_alloc https://msdn.microsoft.com/en-us/library/8z34s9c6.aspx
-check_symbol_exists(_aligned_malloc malloc.h HAVE__ALIGNED_MALLOC)
+check_symbol_exists(_aligned_malloc malloc.h OPJ_HAVE__ALIGNED_MALLOC)
 # posix_memalign
-check_symbol_exists(posix_memalign stdlib.h HAVE_POSIX_MEMALIGN)
+check_symbol_exists(posix_memalign stdlib.h OPJ_HAVE_POSIX_MEMALIGN)
 # memalign (obsolete)
-check_symbol_exists(memalign malloc.h HAVE_MEMALIGN)
+check_symbol_exists(memalign malloc.h OPJ_HAVE_MEMALIGN)
 #-----------------------------------------------------------------------------
 # Build Library
 if(BUILD_JPIP_SERVER)

diff --git a/src/lib/openjp2/opj_config_private.h.cmake.in b/src/lib/openjp2/opj_config_private.h.cmake.in
index 97c9fdc5b5f367993cd1d1e93bd78f4b640b5382..b05822c3ca0a6cb1225e703f5a153e2e9dcfc768 100644 (file)
--- a/src/lib/openjp2/opj_config_private.h.cmake.in
+++ b/src/lib/openjp2/opj_config_private.h.cmake.in
@@ -18,15 +18,15 @@
 #cmakedefine OPJ_HAVE_FSEEKO @OPJ_HAVE_FSEEKO@
 
 /* find whether or not have <malloc.h> */
-#cmakedefine HAVE_MALLOC_H
+#cmakedefine OPJ_HAVE_MALLOC_H
 /* check if function `aligned_alloc` exists */
-#cmakedefine HAVE_ALIGNED_ALLOC
+#cmakedefine OPJ_HAVE_ALIGNED_ALLOC
 /* check if function `_aligned_malloc` exists */
-#cmakedefine HAVE__ALIGNED_MALLOC
+#cmakedefine OPJ_HAVE__ALIGNED_MALLOC
 /* check if function `memalign` exists */
-#cmakedefine HAVE_MEMALIGN
+#cmakedefine OPJ_HAVE_MEMALIGN
 /* check if function `posix_memalign` exists */
-#cmakedefine HAVE_POSIX_MEMALIGN
+#cmakedefine OPJ_HAVE_POSIX_MEMALIGN
 
 /* Byte order.  */
 /* All compilers that support Mac OS X define either __BIG_ENDIAN__ or

diff --git a/src/lib/openjp2/opj_malloc.c b/src/lib/openjp2/opj_malloc.c
index a4aea30f252a759a52030210c3e311965f4a3598..939d82829dc0eb824406269c9e445a4e1cb2d73d 100644 (file)
--- a/src/lib/openjp2/opj_malloc.c
+++ b/src/lib/openjp2/opj_malloc.c
@@ -49,7 +49,7 @@ static INLINE void *opj_aligned_alloc_n(size_t alignment, size_t size)
     return NULL;
   }
 
-#if defined(HAVE_POSIX_MEMALIGN)
+#if defined(OPJ_HAVE_POSIX_MEMALIGN)
   /* aligned_alloc requires c11, restrict to posix_memalign for now. Quote:
    * This function was introduced in POSIX 1003.1d. Although this function is
    * superseded by aligned_alloc, it is more portable to older POSIX systems
@@ -59,10 +59,10 @@ static INLINE void *opj_aligned_alloc_n(size_t alignment, size_t size)
     ptr = NULL;
   }
   /* older linux */
-#elif defined(HAVE_MEMALIGN)
+#elif defined(OPJ_HAVE_MEMALIGN)
   ptr = memalign( alignment, size );
 /* _MSC_VER */
-#elif defined(HAVE__ALIGNED_MALLOC)
+#elif defined(OPJ_HAVE__ALIGNED_MALLOC)
   ptr = _aligned_malloc(size, alignment);
 #else
   /*
@@ -114,7 +114,7 @@ static INLINE void *opj_aligned_realloc_n(void *ptr, size_t alignment, size_t ne
   }
 
 /* no portable aligned realloc */
-#if defined(HAVE_POSIX_MEMALIGN) || defined(HAVE_MEMALIGN)
+#if defined(OPJ_HAVE_POSIX_MEMALIGN) || defined(OPJ_HAVE_MEMALIGN)
   /* glibc doc states one can mixed aligned malloc with realloc */
   r_ptr = realloc( ptr, new_size ); /* fast path */
   /* we simply use `size_t` to cast, since we are only interest in binary AND
@@ -132,7 +132,7 @@ static INLINE void *opj_aligned_realloc_n(void *ptr, size_t alignment, size_t ne
     r_ptr = a_ptr;
   }
 /* _MSC_VER */
-#elif defined(HAVE__ALIGNED_MALLOC)
+#elif defined(OPJ_HAVE__ALIGNED_MALLOC)
   r_ptr = _aligned_realloc( ptr, new_size, alignment );
 #else
   if (ptr == NULL) {
@@ -210,9 +210,9 @@ void * opj_aligned_realloc(void *ptr, size_t size)
 
 void opj_aligned_free(void* ptr)
 {
-#if defined(HAVE_POSIX_MEMALIGN) || defined(HAVE_MEMALIGN)
+#if defined(OPJ_HAVE_POSIX_MEMALIGN) || defined(OPJ_HAVE_MEMALIGN)
   free( ptr );
-#elif defined(HAVE__ALIGNED_MALLOC)
+#elif defined(OPJ_HAVE__ALIGNED_MALLOC)
   _aligned_free( ptr );
 #else
   /* Generic implementation has malloced pointer stored in front of used area */