utils/pspRT header updates for macos compatibility

Author: marclecerf

cpp/include/utils/pspRTmem.h

@@ -37,15 +37,14 @@
 
 #ifndef PBRT_CORE_MEMORY_H
 #define PBRT_CORE_MEMORY_H
-//#include "stdafx.h"
-#include <cstdint>
-#include <malloc.h>
+
 #define PBRT_L1_CACHE_LINE_SIZE 64
 
-// core/memory.h*
-//#include "pbrt.h"
-//#include "parallel.h"
+#include <stdint.h>
+#include <stdlib.h>
+#include <algorithm>
 #include <list>
+#include <utility>
 
 // Memory Declarations
 #define ARENA_ALLOC(arena, Type) new ((arena).Alloc(sizeof(Type))) Type

cpp/raycast/pspRTmem.cpp

@@ -30,22 +30,20 @@
 
  */
 
-//#include "stdafx.h"
-
-// core/memory.cpp*
+#include <cstdlib>
 #include "utils/pspRTmem.h"
 
 // Memory Allocation Functions
 void *AllocAligned(size_t size)
 {
 #if defined(PBRT_IS_WINDOWS)
     return _aligned_malloc(size, PBRT_L1_CACHE_LINE_SIZE);
-#elif defined(PBRT_IS_OPENBSD) || defined(PBRT_IS_OSX)
+#else
     void *ptr;
-    if (posix_memalign(&ptr, PBRT_L1_CACHE_LINE_SIZE, size) != 0) ptr = nullptr;
+    if (posix_memalign(&ptr, PBRT_L1_CACHE_LINE_SIZE, size) != 0) {
+        ptr = nullptr;
+    }
     return ptr;
-#else
-    return memalign(PBRT_L1_CACHE_LINE_SIZE, size);
 #endif
 }