Fix Mac Breakpad host tools to build in Linux cross-compile

src/common/mac/macho_walker.cc

 // Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // macho_walker.cc: Iterate over the load commands in a mach-o file
 //
 // See macho_walker.h for documentation
 //
 // Author: Dan Waylonis
 
-extern "C" {  // necessary for Leopard
-  #include <assert.h>
-  #include <fcntl.h>
-  #include <mach-o/arch.h>
-  #include <mach-o/loader.h>
-  #include <mach-o/swap.h>
-  #include <string.h>
-  #include <unistd.h>
-}
+#include <assert.h>
+#include <fcntl.h>
+#include <mach-o/arch.h>
+#include <mach-o/fat.h>
+#include <mach-o/loader.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "common/mac/byteswap.h"
 #include "common/mac/macho_walker.h"
 #include "common/mac/macho_utilities.h"
 
 namespace MacFileUtilities {
 
 MachoWalker::MachoWalker(const char *path, LoadCommandCallback callback,
                          void *context)
     : file_(-1),
@@ skipping 94 matching lines @@
   }
 
   if (!is_fat) {
     // If we don't have a fat header, check if the cpu type matches the single
     // header
     struct mach_header header;
     if (!ReadBytes(&header, sizeof(header), 0))
       return false;
 
     if (magic == MH_CIGAM || magic == MH_CIGAM_64)
-      swap_mach_header(&header, NXHostByteOrder());
+      breakpad_swap_mach_header(&header);
 
     if (cpu_type != header.cputype ||
         (cpu_subtype != CPU_SUBTYPE_MULTIPLE &&
          cpu_subtype != header.cpusubtype)) {
       return false;
     }
 
     offset = 0;
     return true;
   } else {
     // Read the fat header and find an appropriate architecture
     offset = 0;
     struct fat_header fat;
     if (!ReadBytes(&fat, sizeof(fat), offset))
       return false;
 
     if (NXHostByteOrder() != NX_BigEndian)
-      swap_fat_header(&fat, NXHostByteOrder());
+      breakpad_swap_fat_header(&fat);
 
     offset += sizeof(fat);
 
     // Search each architecture for the desired one
     struct fat_arch arch;
     for (uint32_t i = 0; i < fat.nfat_arch; ++i) {
       if (!ReadBytes(&arch, sizeof(arch), offset))
         return false;
 
       if (NXHostByteOrder() != NX_BigEndian)
-        swap_fat_arch(&arch, 1, NXHostByteOrder());
+        breakpad_swap_fat_arch(&arch, 1);
 
       if (arch.cputype == cpu_type &&
           (cpu_subtype == CPU_SUBTYPE_MULTIPLE ||
            arch.cpusubtype == cpu_subtype)) {
         offset = arch.offset;
         return true;
       }
 
       offset += sizeof(arch);
     }
   }
 
   return false;
 }
 
 bool MachoWalker::WalkHeaderAtOffset(off_t offset) {
   struct mach_header header;
   if (!ReadBytes(&header, sizeof(header), offset))
     return false;
 
   bool swap = (header.magic == MH_CIGAM);
   if (swap)
-    swap_mach_header(&header, NXHostByteOrder());
+    breakpad_swap_mach_header(&header);
 
   // Copy the data into the mach_header_64 structure.  Since the 32-bit and
   // 64-bit only differ in the last field (reserved), this is safe to do.
   struct mach_header_64 header64;
   memcpy((void *)&header64, (const void *)&header, sizeof(header));
   header64.reserved = 0;
 
   current_header_ = &header64;
   current_header_size_ = sizeof(header); // 32-bit, not 64-bit
   current_header_offset_ = offset;
   offset += current_header_size_;
   bool result = WalkHeaderCore(offset, header.ncmds, swap);
   current_header_ = NULL;
   current_header_size_ = 0;
   current_header_offset_ = 0;
   return result;
 }
 
 bool MachoWalker::WalkHeader64AtOffset(off_t offset) {
   struct mach_header_64 header;
   if (!ReadBytes(&header, sizeof(header), offset))
     return false;
 
   bool swap = (header.magic == MH_CIGAM_64);
   if (swap)
-    breakpad_swap_mach_header_64(&header, NXHostByteOrder());
+    breakpad_swap_mach_header_64(&header);
 
   current_header_ = &header;
   current_header_size_ = sizeof(header);
   current_header_offset_ = offset;
   offset += current_header_size_;
   bool result = WalkHeaderCore(offset, header.ncmds, swap);
   current_header_ = NULL;
   current_header_size_ = 0;
   current_header_offset_ = 0;
   return result;
 }
 
 bool MachoWalker::WalkHeaderCore(off_t offset, uint32_t number_of_commands,
                                  bool swap) {
   for (uint32_t i = 0; i < number_of_commands; ++i) {
     struct load_command cmd;
     if (!ReadBytes(&cmd, sizeof(cmd), offset))
       return false;
 
     if (swap)
-      swap_load_command(&cmd, NXHostByteOrder());
+      breakpad_swap_load_command(&cmd);
 
     // Call the user callback
     if (callback_ && !callback_(this, &cmd, offset, swap, callback_context_))
       break;
 
     offset += cmd.cmdsize;
   }
 
   return true;
 }
 
 }  // namespace MacFileUtilities