Mercurial > hg > orthanc
diff OrthancServer/DicomProtocol/DicomServer.cpp @ 930:27d256e0b458 mac
integration mainline -> mac
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 24 Jun 2014 16:47:18 +0200 |
parents | 816dccaeb7cf |
children | e95e7f9eba96 |
line wrap: on
line diff
--- a/OrthancServer/DicomProtocol/DicomServer.cpp Wed Apr 16 17:02:07 2014 +0200 +++ b/OrthancServer/DicomProtocol/DicomServer.cpp Tue Jun 24 16:47:18 2014 +0200 @@ -30,6 +30,7 @@ **/ +#include "../PrecompiledHeadersServer.h" #include "DicomServer.h" #include "../../Core/OrthancException.h" @@ -115,7 +116,7 @@ LoadEmbeddedDictionary(d, EmbeddedResources::DICTIONARY_DICOM); LoadEmbeddedDictionary(d, EmbeddedResources::DICTIONARY_PRIVATE); -#elif defined(__linux) +#elif defined(__linux) || defined(__FreeBSD_kernel__) std::string path = DCMTK_DICTIONARY_DIR; const char* env = std::getenv(DCM_DICT_ENVIRONMENT_VARIABLE); @@ -414,7 +415,7 @@ return true; } - return Orthanc::IsSameAETitle(aet, GetApplicationEntityTitle()); + return Configuration::IsSameAETitle(aet, GetApplicationEntityTitle()); } }