win32: Only define sleep() when it's not found and reorder header fil…

…e includes

configure.ac

@@ -64,7 +64,7 @@ AC_TYPE_UINT8_T
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([strcasecmp strdup strerror strndup])
+AC_CHECK_FUNCS([strcasecmp strdup strerror strndup sleep])
 
 # Check for operating system
 AC_MSG_CHECKING([whether we need platform-specific build settings])

src/libusbmuxd.c

@@ -47,10 +47,15 @@
 #define EBADMSG 104
 #endif
 
+#include <unistd.h>
+#include <signal.h>
+
 #ifdef WIN32
 #include <winsock2.h>
 #include <windows.h>
+#ifndef HAVE_SLEEP
 #define sleep(x) Sleep(x*1000)
+#endif
 #else
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -65,9 +70,6 @@
 #define USBMUXD_SOCKET_NAME "usbmuxd"
 #endif /* HAVE_INOTIFY */
 
-#include <unistd.h>
-#include <signal.h>
-
 #include <plist/plist.h>
 #define PLIST_BUNDLE_ID "org.libimobiledevice.usbmuxd"
 #define PLIST_CLIENT_VERSION_STRING "usbmuxd built for freedom"