Jump to content
TrinityCore

jtth

Plebs
  • Posts

    3
  • Joined

  • Last visited

Posts posted by jtth

  1. jtth, you probably mean this:

    diff --git a/src/server/shared/Cryptography/OpenSSLCrypto.cpp b/src/server/shared/Cryptography/OpenSSLCrypto.cpp
    index 417be81..e3fc28d 100644
    --- a/src/server/shared/Cryptography/OpenSSLCrypto.cpp
    +++ b/src/server/shared/Cryptography/OpenSSLCrypto.cpp
    @@ -25,35 +25,35 @@ std::vector<ACE_Thread_Mutex*> cryptoLocks;
     
     static void lockingCallback(int mode, int type, const char* /*file*/, int /*line*/)
     {
    -    if (mode & CRYPTO_LOCK)
    -        cryptoLocks[type]->acquire();
    -    else
    -        cryptoLocks[type]->release();
    +//    if (mode & CRYPTO_LOCK)
    +//        cryptoLocks[type]->acquire();
    +//    else
    +//        cryptoLocks[type]->release();
     }
     
     static void threadIdCallback(CRYPTO_THREADID * id)
     {
    -    CRYPTO_THREADID_set_numeric(id, ACE_Thread::self());
    +//    CRYPTO_THREADID_set_numeric(id, ACE_Thread::self());
     }
     
     void OpenSSLCrypto::threadsSetup()
     {
    -    cryptoLocks.resize(CRYPTO_num_locks());
    -    for(int i = 0 ; i < CRYPTO_num_locks(); ++i)
    -    {
    -        cryptoLocks[i] = new ACE_Thread_Mutex();
    -    }
    -    CRYPTO_THREADID_set_callback(threadIdCallback);
    -    CRYPTO_set_locking_callback(lockingCallback);
    +//    cryptoLocks.resize(CRYPTO_num_locks());
    +//    for(int i = 0 ; i < CRYPTO_num_locks(); ++i)
    +//    {
    +//        cryptoLocks[i] = new ACE_Thread_Mutex();
    +//    }
    +//    CRYPTO_THREADID_set_callback(threadIdCallback);
    +//    CRYPTO_set_locking_callback(lockingCallback);
     }
     
     void OpenSSLCrypto::threadsCleanup()
     {
    -    CRYPTO_set_locking_callback(NULL);
    -    CRYPTO_THREADID_set_callback(NULL);
    -    for(int i = 0 ; i < CRYPTO_num_locks(); ++i)
    -    {
    -        delete cryptoLocks[i];
    -    }
    -    cryptoLocks.resize(0);
    -}
     No newline at end of file
    +//    CRYPTO_set_locking_callback(NULL);
    +//    CRYPTO_THREADID_set_callback(NULL);
    +//    for(int i = 0 ; i < CRYPTO_num_locks(); ++i)
    +//    {
    +//        delete cryptoLocks[i];
    +//    }
    +//    cryptoLocks.resize(0);
    +}
    

    This makes it compiling if tools are deactivated. Otherwise you have to "remove" a log output in MapBuilder.cpp:

    diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
    index 9c2dda5..9872cf3 100644
    --- a/src/tools/mmaps_generator/MapBuilder.cpp
    +++ b/src/tools/mmaps_generator/MapBuilder.cpp
    @@ -340,7 +340,7 @@ namespace MMAP
         /**************************************************************************/
         void MapBuilder::buildMap(uint32 mapID)
         {
    -        printf("[Thread %u] Building map %03u:n", uint32(ACE_Thread::self()), mapID);
    +        //printf("[Thread %u] Building map %03u:n", uint32(ACE_Thread::self()), mapID);
     
             std::set<uint32>* tiles = getTileList(mapID);
    

    I got it working under Mountain Lion. But it broke again under Mavericks... as I already told :D

    Why yes, you are correct! If you compile w/ dtools=0 it should work. Trying now with dtools at 1. 

×
×
  • Create New...