# HG changeset patch # User Sebastien Jodogne # Date 1479911277 -3600 # Node ID a4a1e40334032d9329e937c29edafc28e811e6f8 # Parent b01d46e5a2b340cf427e583d7cd5bb9cac8ee9a9 sync diff -r b01d46e5a2b3 -r a4a1e4033403 Resources/Orthanc/Core/SystemToolbox.cpp --- a/Resources/Orthanc/Core/SystemToolbox.cpp Wed Nov 23 12:08:15 2016 +0100 +++ b/Resources/Orthanc/Core/SystemToolbox.cpp Wed Nov 23 15:27:57 2016 +0100 @@ -35,27 +35,29 @@ #if BOOST_HAS_DATE_TIME == 1 -#include +# include #endif #if defined(_WIN32) -#include -#include // For "_spawnvp()" and "_getpid()" +# include +# include // For "_spawnvp()" and "_getpid()" #else -#include // For "execvp()" -#include // For "waitpid()" +# include // For "execvp()" +# include // For "waitpid()" #endif + #if defined(__APPLE__) && defined(__MACH__) -#include /* _NSGetExecutablePath */ -#include /* PATH_MAX */ +# include /* _NSGetExecutablePath */ +# include /* PATH_MAX */ #endif + #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -#include /* PATH_MAX */ -#include -#include +# include /* PATH_MAX */ +# include +# include #endif diff -r b01d46e5a2b3 -r a4a1e4033403 Resources/Orthanc/Core/Toolbox.cpp --- a/Resources/Orthanc/Core/Toolbox.cpp Wed Nov 23 12:08:15 2016 +0100 +++ b/Resources/Orthanc/Core/Toolbox.cpp Wed Nov 23 15:27:57 2016 +0100 @@ -77,6 +77,10 @@ #endif +#if defined(_WIN32) +# include // For ::Sleep +#endif + #if ORTHANC_ENABLE_PUGIXML == 1 # include "ChunkedBuffer.h" diff -r b01d46e5a2b3 -r a4a1e4033403 Resources/SyncOrthancFolder.py --- a/Resources/SyncOrthancFolder.py Wed Nov 23 12:08:15 2016 +0100 +++ b/Resources/SyncOrthancFolder.py Wed Nov 23 15:27:57 2016 +0100 @@ -92,7 +92,7 @@ except: pass - url = '%s/%s/%s?aaiai' % (REPOSITORY, branch, source) + url = '%s/%s/%s' % (REPOSITORY, branch, source) with open(target, 'w') as f: f.write(urllib2.urlopen(url).read())