Mercurial > hg > orthanc

comparison OrthancServer/FromDcmtkBridge.cpp @ 1976:325772dadcd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Macro "__linux" (now obsolete) replaced by macro "__linux__"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 14 Apr 2016 17:34:43 +0200
parents dba0db0a94b4
children 4b545a8b1f95
comparison
equal deleted inserted replaced
1975:730eedd9a5dc 1976:325772dadcd6
193 //LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICONDE); 193 //LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICONDE);
194 194
195 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICOM); 195 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICOM);
196 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_PRIVATE); 196 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_PRIVATE);
197 197
198 #elif defined(__linux) || defined(__FreeBSD_kernel__) 198 #elif defined(__linux__) || defined(__FreeBSD_kernel__)
199 std::string path = DCMTK_DICTIONARY_DIR; 199 std::string path = DCMTK_DICTIONARY_DIR;
200 200
201 const char* env = std::getenv(DCM_DICT_ENVIRONMENT_VARIABLE); 201 const char* env = std::getenv(DCM_DICT_ENVIRONMENT_VARIABLE);
202 if (env != NULL) 202 if (env != NULL)
203 { 203 {