Solaris: various edits towards compiling Chromium on Solaris. Changed __Solar...

base/data_pack.cc

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/data_pack.h"
 
 #include <errno.h>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
 
 // For details of the file layout, see
 // http://dev.chromium.org/developers/design-documents/linuxresourcesandlocalizedstrings
 
 namespace {
 
 // A word is four bytes.
 static const size_t kWord = 4;
 
 static const uint32 kFileFormatVersion = 1;
 // Length of file header: version and entry count.
 static const size_t kHeaderLength = 2 * sizeof(uint32);
 
-#pragma pack(push,1)
 struct DataPackEntry {
   uint32 resource_id;
   uint32 file_offset;
   uint32 length;
 
   static int CompareById(const void* void_key, const void* void_entry) {
     uint32 key = *reinterpret_cast<const uint32*>(void_key);
     const DataPackEntry* entry =
         reinterpret_cast<const DataPackEntry*>(void_entry);
     if (key < entry->resource_id) {
       return -1;
     } else if (key > entry->resource_id) {
       return 1;
     } else {
       return 0;
     }
   }
 };
-#pragma pack(pop)
 
 COMPILE_ASSERT(sizeof(DataPackEntry) == 12, size_of_header_must_be_twelve);
 
 }  // anonymous namespace
 
 namespace base {
 
 // In .cc for MemoryMappedFile dtor.
 DataPack::DataPack() : resource_count_(0) {
 }
@@ skipping 132 matching lines @@
       return false;
     }
   }
 
   file_util::CloseFile(file);
 
   return true;
 }
 
 }  // namespace base