twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-11 07:17:53 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
OSX build documentation updates, cleanups, warning suppression.
This commit is contained in:
miguelfreitas 2014-01-16 05:46:34 -08:00
commit 042617722b
5 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/build-osx.md
View File

@ -41,7 +41,7 @@ Instructions: HomeBrew
#### Install dependencies using 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 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 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:
export BOOST_LIB_SUFFIX=-mt export BOOST_LIB_SUFFIX=-mt
export LDFLAGS="-L$OPENSSL_LIB_PATH -L$BDB_LIB_PATH -L$BOOST_LIB_PATH" 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 CPPFLAGS="-I$OPENSSL_INCLUDE_PATH -I$BDB_INCLUDE_PATH -I$BOOST_INCLUDE_PATH"
export PATH=${BDB_INCLUDE_PATH}:${PATH}
3. Build libtorrent 3. Build libtorrent

0
libtorrent/build-aux/config.guess vendored Executable file → Normal file
View File

1
src/core.h
View File

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

1
src/leveldb/table/table.cc
View File

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

1
src/leveldb/util/cache.cc
View File

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