Browse Source

Merge pull request #75 from gubatron/osx-env-warning-cleanups-doc-updates

OSX build documentation updates, cleanups, warning suppression.
miguelfreitas
miguelfreitas 11 years ago
parent
commit
042617722b
  1. 3
      doc/build-osx.md
  2. 0
      libtorrent/build-aux/config.guess
  3. 1
      src/core.h
  4. 1
      src/leveldb/table/table.cc
  5. 1
      src/leveldb/util/cache.cc

3
doc/build-osx.md

@ -41,7 +41,7 @@ Instructions: HomeBrew @@ -41,7 +41,7 @@ Instructions: HomeBrew
#### Install dependencies using Homebrew
brew install boost miniupnpc openssl berkeley-db4
brew install boost miniupnpc openssl berkeley-db4 autoconf automake
Note: After you have installed the dependencies, you should check that the Brew-installed
version of OpenSSL is the one available for compilation. You can check this by typing
@ -73,6 +73,7 @@ Instead, it's enough to make sure the right openssl binary is on your $PATH: @@ -73,6 +73,7 @@ Instead, it's enough to make sure the right openssl binary is on your $PATH:
export BOOST_LIB_SUFFIX=-mt
export LDFLAGS="-L$OPENSSL_LIB_PATH -L$BDB_LIB_PATH -L$BOOST_LIB_PATH"
export CPPFLAGS="-I$OPENSSL_INCLUDE_PATH -I$BDB_INCLUDE_PATH -I$BOOST_INCLUDE_PATH"
export PATH=${BDB_INCLUDE_PATH}:${PATH}
3. Build libtorrent

0
libtorrent/build-aux/config.guess vendored

1
src/core.h

@ -404,7 +404,6 @@ public: @@ -404,7 +404,6 @@ public:
template<typename Stream>
void Unserialize(Stream &s, int nType, int nVersion) {
unsigned int nCode = 0;
// version
::Unserialize(s, VARINT(this->nVersion), nType, nVersion);
// header code

1
src/leveldb/table/table.cc

@ -228,7 +228,6 @@ Status Table::InternalGet(const ReadOptions& options, const Slice& k, @@ -228,7 +228,6 @@ Status Table::InternalGet(const ReadOptions& options, const Slice& k,
!filter->KeyMayMatch(handle.offset(), k)) {
// Not found
} else {
Slice handle = iiter->value();
Iterator* block_iter = BlockReader(this, options, iiter->value());
block_iter->Seek(k);
if (block_iter->Valid()) {

1
src/leveldb/util/cache.cc

@ -116,7 +116,6 @@ class HandleTable { @@ -116,7 +116,6 @@ class HandleTable {
LRUHandle* h = list_[i];
while (h != NULL) {
LRUHandle* next = h->next_hash;
Slice key = h->key();
uint32_t hash = h->hash;
LRUHandle** ptr = &new_list[hash & (new_length - 1)];
h->next_hash = *ptr;

Loading…
Cancel
Save