Mercurial > hg > orthanc-stone
changeset 23:a4a1e4033403
sync
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 23 Nov 2016 15:27:57 +0100 |
| parents | b01d46e5a2b3 |
| children | 902e6c52e154 |
| files | Resources/Orthanc/Core/SystemToolbox.cpp Resources/Orthanc/Core/Toolbox.cpp Resources/SyncOrthancFolder.py |
| diffstat | 3 files changed, 17 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- 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 <boost/date_time/posix_time/posix_time.hpp> +# include <boost/date_time/posix_time/posix_time.hpp> #endif #if defined(_WIN32) -#include <windows.h> -#include <process.h> // For "_spawnvp()" and "_getpid()" +# include <windows.h> +# include <process.h> // For "_spawnvp()" and "_getpid()" #else -#include <unistd.h> // For "execvp()" -#include <sys/wait.h> // For "waitpid()" +# include <unistd.h> // For "execvp()" +# include <sys/wait.h> // For "waitpid()" #endif + #if defined(__APPLE__) && defined(__MACH__) -#include <mach-o/dyld.h> /* _NSGetExecutablePath */ -#include <limits.h> /* PATH_MAX */ +# include <mach-o/dyld.h> /* _NSGetExecutablePath */ +# include <limits.h> /* PATH_MAX */ #endif + #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -#include <limits.h> /* PATH_MAX */ -#include <signal.h> -#include <unistd.h> +# include <limits.h> /* PATH_MAX */ +# include <signal.h> +# include <unistd.h> #endif
--- 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 <windows.h> // For ::Sleep +#endif + #if ORTHANC_ENABLE_PUGIXML == 1 # include "ChunkedBuffer.h"
--- 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())