From d454b672efaf3d35b8929077d666d38c63f3c206 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Fri, 5 May 2023 15:21:07 -0400 Subject: [PATCH 1/2] Build fixes for OpenBSD --- extern/wcwidth/wcwidth.h | 2 +- intern/cycles/util/aligned_malloc.cpp | 6 ++++-- intern/guardedalloc/intern/mallocn.c | 3 ++- intern/guardedalloc/intern/mallocn_intern.h | 3 ++- intern/libmv/libmv/base/aligned_malloc.cc | 6 ++++-- source/blender/blenlib/BLI_filereader.h | 3 ++- source/blender/blenlib/BLI_sys_types.h | 2 +- source/blender/blenlib/intern/storage.c | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/extern/wcwidth/wcwidth.h b/extern/wcwidth/wcwidth.h index 3039a50bddd..de9a1065578 100644 --- a/extern/wcwidth/wcwidth.h +++ b/extern/wcwidth/wcwidth.h @@ -21,7 +21,7 @@ #define __WCWIDTH_H__ #ifndef __cplusplus -# if defined(__APPLE__) || defined(__NetBSD__) +# if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) /* The standard header is missing on macOS. */ #include typedef unsigned int char32_t; diff --git a/intern/cycles/util/aligned_malloc.cpp b/intern/cycles/util/aligned_malloc.cpp index 5081d25533e..f617c77fbb0 100644 --- a/intern/cycles/util/aligned_malloc.cpp +++ b/intern/cycles/util/aligned_malloc.cpp @@ -8,7 +8,8 @@ /* Adopted from Libmv. */ -#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ + !defined(__OpenBSD__) /* Needed for memalign on Linux and _aligned_alloc on Windows. */ # ifdef FREE_WINDOWS /* Make sure _aligned_malloc is included. */ @@ -33,7 +34,8 @@ void *util_aligned_malloc(size_t size, int alignment) return MEM_mallocN_aligned(size, alignment, "Cycles Aligned Alloc"); #elif defined(_WIN32) return _aligned_malloc(size, alignment); -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) void *result; if (posix_memalign(&result, alignment, size)) { /* Non-zero means allocation error diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 984e641e7c1..388e70f33a2 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -59,7 +59,8 @@ void *aligned_malloc(size_t size, size_t alignment) #ifdef _WIN32 return _aligned_malloc(size, alignment); -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) void *result; if (posix_memalign(&result, alignment, size)) { diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index 88250b160d4..32bdcd85786 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -52,7 +52,8 @@ size_t malloc_usable_size(void *ptr); # define UNLIKELY(x) (x) #endif -#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ + !defined(__OpenBSD__) // Needed for memalign on Linux and _aligned_alloc on Windows. # include diff --git a/intern/libmv/libmv/base/aligned_malloc.cc b/intern/libmv/libmv/base/aligned_malloc.cc index 6e327acf928..a250ddde194 100644 --- a/intern/libmv/libmv/base/aligned_malloc.cc +++ b/intern/libmv/libmv/base/aligned_malloc.cc @@ -21,7 +21,8 @@ #include "libmv/base/aligned_malloc.h" #include "libmv/logging/logging.h" -#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ + !defined(__OpenBSD__) // Needed for memalign on Linux and _aligned_alloc on Windows. # ifdef FREE_WINDOWS /* make sure _aligned_malloc is included */ @@ -44,7 +45,8 @@ namespace libmv { void* aligned_malloc(int size, int alignment) { #ifdef _WIN32 return _aligned_malloc(size, alignment); -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) void* result; if (posix_memalign(&result, alignment, size)) { diff --git a/source/blender/blenlib/BLI_filereader.h b/source/blender/blenlib/BLI_filereader.h index a0f4f82b505..21572769bfc 100644 --- a/source/blender/blenlib/BLI_filereader.h +++ b/source/blender/blenlib/BLI_filereader.h @@ -17,7 +17,8 @@ #include "BLI_compiler_attrs.h" #include "BLI_utildefines.h" -#if defined(_MSC_VER) || defined(__APPLE__) || defined(__HAIKU__) || defined(__NetBSD__) +#if defined(_MSC_VER) || defined(__APPLE__) || defined(__HAIKU__) || \ + defined(__NetBSD__) || defined(__OpenBSD__) typedef int64_t off64_t; #endif diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index 3e31fc84896..84673ccad1c 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -57,7 +57,7 @@ typedef uint64_t u_int64_t; #ifndef __cplusplus /* The standard header is missing on some systems. */ -# if defined(__APPLE__) || defined(__NetBSD__) +# if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) typedef unsigned int char32_t; # else # include diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 7b2f0d049bb..f4632401aa3 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -13,7 +13,7 @@ #include -#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__HAIKU__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__HAIKU__) /* Other modern unix OS's should probably use this also. */ # include # define USE_STATFS_STATVFS -- 2.30.2 From 71b1aed492594c84ea09800c7d4285ef48e9c86c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 9 May 2023 13:09:46 +0200 Subject: [PATCH 2/2] make format --- intern/cycles/util/aligned_malloc.cpp | 6 ++---- intern/guardedalloc/intern/mallocn.c | 3 +-- intern/guardedalloc/intern/mallocn_intern.h | 3 +-- intern/libmv/libmv/base/aligned_malloc.cc | 6 +++--- source/blender/blenlib/BLI_filereader.h | 4 ++-- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/intern/cycles/util/aligned_malloc.cpp b/intern/cycles/util/aligned_malloc.cpp index f617c77fbb0..cea29ea4df0 100644 --- a/intern/cycles/util/aligned_malloc.cpp +++ b/intern/cycles/util/aligned_malloc.cpp @@ -8,8 +8,7 @@ /* Adopted from Libmv. */ -#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ - !defined(__OpenBSD__) +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) /* Needed for memalign on Linux and _aligned_alloc on Windows. */ # ifdef FREE_WINDOWS /* Make sure _aligned_malloc is included. */ @@ -34,8 +33,7 @@ void *util_aligned_malloc(size_t size, int alignment) return MEM_mallocN_aligned(size, alignment, "Cycles Aligned Alloc"); #elif defined(_WIN32) return _aligned_malloc(size, alignment); -#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ - defined(__OpenBSD__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) void *result; if (posix_memalign(&result, alignment, size)) { /* Non-zero means allocation error diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 388e70f33a2..c3a78eec653 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -59,8 +59,7 @@ void *aligned_malloc(size_t size, size_t alignment) #ifdef _WIN32 return _aligned_malloc(size, alignment); -#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ - defined(__OpenBSD__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) void *result; if (posix_memalign(&result, alignment, size)) { diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index 32bdcd85786..54acf7d6bd2 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -52,8 +52,7 @@ size_t malloc_usable_size(void *ptr); # define UNLIKELY(x) (x) #endif -#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ - !defined(__OpenBSD__) +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) // Needed for memalign on Linux and _aligned_alloc on Windows. # include diff --git a/intern/libmv/libmv/base/aligned_malloc.cc b/intern/libmv/libmv/base/aligned_malloc.cc index a250ddde194..dc1519a0b54 100644 --- a/intern/libmv/libmv/base/aligned_malloc.cc +++ b/intern/libmv/libmv/base/aligned_malloc.cc @@ -21,7 +21,7 @@ #include "libmv/base/aligned_malloc.h" #include "libmv/logging/logging.h" -#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ !defined(__OpenBSD__) // Needed for memalign on Linux and _aligned_alloc on Windows. # ifdef FREE_WINDOWS @@ -45,8 +45,8 @@ namespace libmv { void* aligned_malloc(int size, int alignment) { #ifdef _WIN32 return _aligned_malloc(size, alignment); -#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ - defined(__OpenBSD__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) void* result; if (posix_memalign(&result, alignment, size)) { diff --git a/source/blender/blenlib/BLI_filereader.h b/source/blender/blenlib/BLI_filereader.h index 21572769bfc..0e90e20d7aa 100644 --- a/source/blender/blenlib/BLI_filereader.h +++ b/source/blender/blenlib/BLI_filereader.h @@ -17,8 +17,8 @@ #include "BLI_compiler_attrs.h" #include "BLI_utildefines.h" -#if defined(_MSC_VER) || defined(__APPLE__) || defined(__HAIKU__) || \ - defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(_MSC_VER) || defined(__APPLE__) || defined(__HAIKU__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) typedef int64_t off64_t; #endif -- 2.30.2