diff options
| author | 2013-09-26 23:48:04 +0200 | |
|---|---|---|
| committer | 2013-09-26 23:48:04 +0200 | |
| commit | 218635e3710ef6df647752294d52c8200b643b6f (patch) | |
| tree | a7d8f550947064db8fee539efb938dfa58ed0093 | |
| parent | 55a44b7ed78cad9f236b50ba67bd143dd5757bbd (diff) | |
| download | libirecovery-218635e3710ef6df647752294d52c8200b643b6f.tar.gz libirecovery-218635e3710ef6df647752294d52c8200b643b6f.tar.bz2 | |
Move various WIN32 includes private, no need to keep them in the header
| -rw-r--r-- | include/libirecovery.h | 10 | ||||
| -rw-r--r-- | src/libirecovery.c | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/include/libirecovery.h b/include/libirecovery.h index f974080..8c17167 100644 --- a/include/libirecovery.h +++ b/include/libirecovery.h | |||
| @@ -26,16 +26,6 @@ extern "C" { | |||
| 26 | 26 | ||
| 27 | #include <stdint.h> | 27 | #include <stdint.h> |
| 28 | 28 | ||
| 29 | #ifndef WIN32 | ||
| 30 | #include <libusb-1.0/libusb.h> | ||
| 31 | #else | ||
| 32 | #define WIN32_LEAN_AND_MEAN | ||
| 33 | #include <windows.h> | ||
| 34 | #undef interface | ||
| 35 | #ifndef sleep | ||
| 36 | #define sleep(n) Sleep(1000 * n) | ||
| 37 | #endif | ||
| 38 | #endif | ||
| 39 | 29 | ||
| 40 | #define APPLE_VENDOR_ID 0x05AC | 30 | #define APPLE_VENDOR_ID 0x05AC |
| 41 | #define CPID_UNKNOWN -1 | 31 | #define CPID_UNKNOWN -1 |
diff --git a/src/libirecovery.c b/src/libirecovery.c index 6a8f470..a9369dc 100644 --- a/src/libirecovery.c +++ b/src/libirecovery.c | |||
| @@ -31,9 +31,13 @@ | |||
| 31 | #else | 31 | #else |
| 32 | #define WIN32_LEAN_AND_MEAN | 32 | #define WIN32_LEAN_AND_MEAN |
| 33 | #include <windows.h> | 33 | #include <windows.h> |
| 34 | #undef interface | ||
| 34 | #include <setupapi.h> | 35 | #include <setupapi.h> |
| 35 | #define _FMT_qX "%I64X" | 36 | #define _FMT_qX "%I64X" |
| 36 | #define _FMT_016llx "%016I64x" | 37 | #define _FMT_016llx "%016I64x" |
| 38 | #ifndef sleep | ||
| 39 | #define sleep(n) Sleep(1000 * n) | ||
| 40 | #endif | ||
| 37 | #endif | 41 | #endif |
| 38 | 42 | ||
| 39 | #include "libirecovery.h" | 43 | #include "libirecovery.h" |
