From 224fb3cc76a4b0249158ebe2ec78b823500dd420 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Sun, 12 Feb 2012 21:19:07 +0100 Subject: win32: use #ifndef to prevent warning about sleep being already defined --- src/common.h | 2 ++ src/libirecovery.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/common.h b/src/common.h index 938d14c..1ffe3bd 100644 --- a/src/common.h +++ b/src/common.h @@ -191,7 +191,9 @@ char *generate_guid(); #include #define __mkdir(path, mode) mkdir(path) #define FMT_qu "%I64u" +#ifndef sleep #define sleep(x) Sleep(x*1000) +#endif #else #define __mkdir(path, mode) mkdir(path, mode) #define FMT_qu "%qu" diff --git a/src/libirecovery.h b/src/libirecovery.h index 0af73e6..84d8681 100644 --- a/src/libirecovery.h +++ b/src/libirecovery.h @@ -30,8 +30,10 @@ extern "C" { #define WIN32_LEAN_AND_MEAN #include #undef interface +#ifndef sleep #define sleep(n) Sleep(1000 * n) #endif +#endif #define APPLE_VENDOR_ID 0x05AC -- cgit v1.1-32-gdbae