Index: bt-host.c
===================================================================
--- bt-host.c	(revision 5499)
+++ bt-host.c	(working copy)
@@ -200,7 +200,7 @@
 #else
 struct HCIInfo *bt_host_hci(const char *id)
 {
-    fprintf(stderr, "qemu: bluetooth passthrough not supported (yet)\n", errno);
+    fprintf(stderr, "qemu: bluetooth passthrough not supported (yet)\n");
 
     return 0;
 }
Index: exec.c
===================================================================
--- exec.c	(revision 5499)
+++ exec.c	(working copy)
@@ -233,7 +233,6 @@
 #ifdef _WIN32
     {
         SYSTEM_INFO system_info;
-        DWORD old_protect;
 
         GetSystemInfo(&system_info);
         qemu_real_host_page_size = system_info.dwPageSize;
Index: tap-win32.c
===================================================================
--- tap-win32.c	(revision 5499)
+++ tap-win32.c	(working copy)
@@ -77,7 +77,7 @@
 // Compile time configuration
 //======================
 
-//#define DEBUG_TAP_WIN32 1
+//#define DEBUG_TAP_WIN32
 
 #define TUN_ASYNCHRONOUS_WRITES 1
 
@@ -509,7 +509,7 @@
                 result = GetOverlappedResult( overlapped->handle, &overlapped->read_overlapped,
                                               &read_size, FALSE);
                 if (!result) {
-#if DEBUG_TAP_WIN32
+#ifdef DEBUG_TAP_WIN32
                     LPVOID lpBuffer;
                     dwError = GetLastError();
                     FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
@@ -520,7 +520,7 @@
 #endif
                 }
             } else {
-#if DEBUG_TAP_WIN32
+#ifdef DEBUG_TAP_WIN32
                 LPVOID lpBuffer;
                 FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
                                NULL, dwError, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),