Cleanup / refactoring

Author: jeremy-rifkin

src/binary/elf.cpp

@@ -7,7 +7,7 @@
 #include "utils/io/file.hpp"
 #include "utils/string_view.hpp"
 
-#if IS_LINUX && !defined(__CYGWIN__)
+#if IS_LINUX && !IS_CYGWIN
 
 #include <array>
 #include <cstdint>

src/binary/elf.hpp

@@ -7,7 +7,7 @@
 #include "utils/span.hpp"
 #include "utils/utils.hpp"
 
-#if IS_LINUX && !defined(__CYGWIN__)
+#if IS_LINUX && !IS_CYGWIN
 
 #include <cstdint>
 #include <string>

src/binary/module_base.cpp

@@ -7,21 +7,21 @@
 #include <mutex>
 #include <unordered_map>
 
-#if (IS_LINUX || IS_APPLE) && !defined(__CYGWIN__)
+#if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
  #include <unistd.h>
  #include <dlfcn.h>
  #if IS_APPLE
   #include "binary/mach-o.hpp"
  #else
   #include "binary/elf.hpp"
  #endif
-#elif IS_WINDOWS || defined(__CYGWIN__)
+#elif IS_WINDOWS || IS_CYGWIN
  #include "binary/pe.hpp"
 #endif
 
 CPPTRACE_BEGIN_NAMESPACE
 namespace detail {
-    #if IS_LINUX && !defined(__CYGWIN__)
+    #if IS_LINUX && !IS_CYGWIN
     Result<std::uintptr_t, internal_error> get_module_image_base(const std::string& object_path) {
         static std::mutex mutex;
         std::lock_guard<std::mutex> lock(mutex);

src/binary/object.cpp

@@ -11,13 +11,13 @@
 #include <mutex>
 #include <unordered_map>
 
-#if (IS_LINUX || IS_APPLE) && !defined(__CYGWIN__)
+#if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
  #include <unistd.h>
  #include <dlfcn.h>
  #if IS_LINUX && (defined(CPPTRACE_HAS_DL_FIND_OBJECT) || defined(CPPTRACE_HAS_DLADDR1))
   #include <link.h> // needed for dladdr1's link_map info
  #endif
-#elif IS_WINDOWS || defined(__CYGWIN__)
+#elif IS_WINDOWS || IS_CYGWIN
  #ifndef WIN32_LEAN_AND_MEAN
   #define WIN32_LEAN_AND_MEAN
  #endif
@@ -26,7 +26,7 @@
 
 CPPTRACE_BEGIN_NAMESPACE
 namespace detail {
-    #if (IS_LINUX || IS_APPLE) && !defined(__CYGWIN__)
+    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
     #if defined(CPPTRACE_HAS_DL_FIND_OBJECT) || defined(CPPTRACE_HAS_DLADDR1)
     std::string resolve_l_name(const char* l_name) {
         if(l_name != nullptr && l_name[0] != 0) {

src/binary/pe.cpp

@@ -4,7 +4,7 @@
 #include "utils/error.hpp"
 #include "utils/utils.hpp"
 
-#if IS_WINDOWS || defined(__CYGWIN__)
+#if IS_WINDOWS || IS_CYGWIN
 #include <array>
 #include <cstdio>
 #include <cstring>
@@ -31,13 +31,13 @@ namespace detail {
         // https://drive.google.com/file/d/0B3_wGJkuWLytbnIxY1J5WUs4MEk/view?pli=1&resourcekey=0-n5zZ2UW39xVTH8ZSu6C2aQ
         // https://0xrick.github.io/win-internals/pe3/
         // Endianness should always be little for dos and pe headers
+        std::FILE* file_ptr;
         #ifdef __CYGWIN__
-         std::FILE* file_ptr = std::fopen(object_path.c_str(), "rb");
+         file_ptr = std::fopen(object_path.c_str(), "rb");
          if(!file_ptr) {
              return internal_error("Unable to read object file {}", object_path);
          }
         #else
-         std::FILE* file_ptr;
          errno_t ret = fopen_s(&file_ptr, object_path.c_str(), "rb");
          if(ret != 0 || file_ptr == nullptr) {
              return internal_error("Unable to read object file {}", object_path);

src/binary/pe.hpp

@@ -4,7 +4,7 @@
 #include "platform/platform.hpp"
 #include "utils/utils.hpp"
 
-#if IS_WINDOWS || defined(__CYGWIN__)
+#if IS_WINDOWS || IS_CYGWIN
 #include <cstdint>
 #include <string>
 

src/from_current.cpp

@@ -294,7 +294,7 @@ namespace detail {
         if(type_info_addr - page_addr + sizeof(void*) > static_cast<unsigned>(page_size)) {
             throw internal_error("pointer crosses page boundaries");
         }
-        #if IS_WINDOWS || defined(__CYGWIN__)
+        #if IS_WINDOWS || IS_CYGWIN
         auto old_protections = mprotect_page_and_return_old_protections(
             reinterpret_cast<void*>(page_addr),
             page_size,

src/jit/jit_objects.cpp

@@ -15,7 +15,7 @@
 
 CPPTRACE_BEGIN_NAMESPACE
 namespace detail {
-    #if (IS_LINUX || IS_APPLE) && !defined(__CYGWIN__)
+    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
     class jit_object_manager {
         struct object_entry {
             const char* object_start;
@@ -135,7 +135,7 @@ namespace detail {
         manager.clear_all_jit_objects();
     }
 
-    #if (IS_LINUX || IS_APPLE) && !defined(__CYGWIN__)
+    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
     optional<jit_object_lookup_result> lookup_jit_object(frame_ptr pc) {
         return get_jit_object_manager().lookup(pc);
     }

src/jit/jit_objects.hpp

@@ -13,7 +13,7 @@ namespace detail {
     void unregister_jit_object(const char*);
     void clear_all_jit_objects();
 
-    #if (IS_LINUX || IS_APPLE) && !defined(__CYGWIN__)
+    #if (IS_LINUX || IS_APPLE) && !IS_CYGWIN
     #if IS_LINUX
      using jit_object_type = elf;
     #elif IS_APPLE

src/platform/memory_mapping.cpp

@@ -5,7 +5,7 @@
 
 #ifndef _MSC_VER
 
-#if IS_WINDOWS || defined(__CYGWIN__)
+#if IS_WINDOWS || IS_CYGWIN
  #ifndef WIN32_LEAN_AND_MEAN
   #define WIN32_LEAN_AND_MEAN
  #endif
@@ -31,7 +31,7 @@
 
 CPPTRACE_BEGIN_NAMESPACE
 namespace detail {
-    #if IS_WINDOWS || defined(__CYGWIN__)
+    #if IS_WINDOWS || IS_CYGWIN
     // Cygwin uses GCC/Itanium ABI but Cygwin's mprotect seems to require 64KB-aligned addresses (allocation
     // granularity returned by sysconf(_SC_PAGESIZE)) while we need actual page granularity for typeinfo surgery.
     // Using the windows API here works best.