diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 00:35:15 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 00:35:15 +0000 |
| commit | 93f21e4ceb7b2bda9d50657cce47f2e640e567b5 (patch) | |
| tree | 701675d956c23c5bd600141342b867a411bd1a2c /base/data_pack.cc | |
| parent | 466cd64ae3c3550a5c5695a6d5fa8f9ab47f2456 (diff) | |
| download | chromium_src-93f21e4ceb7b2bda9d50657cce47f2e640e567b5.zip chromium_src-93f21e4ceb7b2bda9d50657cce47f2e640e567b5.tar.gz chromium_src-93f21e4ceb7b2bda9d50657cce47f2e640e567b5.tar.bz2 | |
Solaris: various edits towards compiling Chromium on Solaris. Changed __Solaris__ to __sun. Defined NAME_MAX as MAXNAMLEN for systems where it is undefined.
BUG=30101
TEST=compiles
Patch by James Choi <jchoi42 at pha.jhu.edu>
Review URL: http://codereview.chromium.org/652166
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/data_pack.cc')
| -rw-r--r-- | base/data_pack.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/base/data_pack.cc b/base/data_pack.cc index 1078d0a..4e5a569 100644 --- a/base/data_pack.cc +++ b/base/data_pack.cc @@ -22,7 +22,6 @@ 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; @@ -41,7 +40,6 @@ struct DataPackEntry { } } }; -#pragma pack(pop) COMPILE_ASSERT(sizeof(DataPackEntry) == 12, size_of_header_must_be_twelve); |