From 3a0db500d0e57e07700fb398ddcdea8edc5aa8ea Mon Sep 17 00:00:00 2001
From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
Date: Tue, 21 Nov 2023 21:32:42 -0600
Subject: [PATCH] Fixes

---
 include/cpptrace/cpptrace.hpp | 3 ++-
 src/binary/object.hpp         | 4 ++--
 src/binary/safe_dl.hpp        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/cpptrace/cpptrace.hpp b/include/cpptrace/cpptrace.hpp
index 04aa6c9..a879954 100644
--- a/include/cpptrace/cpptrace.hpp
+++ b/include/cpptrace/cpptrace.hpp
@@ -371,7 +371,8 @@ namespace cpptrace {
         std::exception_ptr nested_ptr() const noexcept;
     };
 
-    CPPTRACE_EXPORT [[noreturn]] void rethrow_and_wrap_if_needed(std::size_t skip = 0);
+    // [[noreturn]] must come first due to old clang
+    [[noreturn]] CPPTRACE_EXPORT void rethrow_and_wrap_if_needed(std::size_t skip = 0);
 }
 
 #if defined(CPPTRACE_STD_FORMAT) && defined(__cpp_lib_format)
diff --git a/src/binary/object.hpp b/src/binary/object.hpp
index 8cd899a..1af4f21 100644
--- a/src/binary/object.hpp
+++ b/src/binary/object.hpp
@@ -17,7 +17,7 @@
  #else
   #include "elf.hpp"
  #endif
- #if CPPTRACE_HAS_DL_FIND_OBJECT
+ #ifdef CPPTRACE_HAS_DL_FIND_OBJECT
   #include <link.h>
  #endif
 #elif IS_WINDOWS
@@ -64,7 +64,7 @@ namespace detail {
         }
     }
     #endif
-    #if CPPTRACE_HAS_DL_FIND_OBJECT
+    #ifdef CPPTRACE_HAS_DL_FIND_OBJECT
     inline std::vector<object_frame> get_frames_object_info(const std::vector<frame_ptr>& addrs) {
         // Use _dl_find_object when we can, it's orders of magnitude faster
         std::vector<object_frame> frames;
diff --git a/src/binary/safe_dl.hpp b/src/binary/safe_dl.hpp
index 9376293..5132808 100644
--- a/src/binary/safe_dl.hpp
+++ b/src/binary/safe_dl.hpp
@@ -12,7 +12,7 @@
 #include <cstring>
 #include <iostream>
 
-#if CPPTRACE_HAS_DL_FIND_OBJECT
+#ifdef CPPTRACE_HAS_DL_FIND_OBJECT
 #if IS_LINUX || IS_APPLE
  #include <unistd.h>
  #include <dlfcn.h>