Various adjustments for MSVC.

- MSVC uses different namings in some places. Adjust the sources via the
  preprocessor if build with MSVC.
- MSVC doesn't know about __func__, use name instead.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31185 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 10 insertions, 3 deletions

diff --git a/rbutil/ipodpatcher/ipodio.h b/rbutil/ipodpatcher/ipodio.h
index 6aa675535a..e08d74a785 100644
--- a/rbutil/ipodpatcher/ipodio.h
+++ b/rbutil/ipodpatcher/ipodio.h
@@ -23,9 +23,14 @@
 #define __IPODIO_H
 
 #include <stdint.h>
+#if !defined(_WIN32)
 #include <unistd.h>
+#elif defined(_MSC_VER)
+/* MSVC uses a different name for ssize_t */
+#define ssize_t SSIZE_T
+#endif
 
-#ifdef __WIN32__
+#if defined(__WIN32__) || defined(_WIN32)
 #include <windows.h>
 #else
 #define HANDLE int
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
index a67dbc0386..b718db8729 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
@@ -139,7 +139,7 @@ void BootloaderInstallBase::downloadBlFinish(bool error)
 
 void BootloaderInstallBase::installBlfile(void)
 {
-    qDebug() << "[BootloaderInstallBase]" << __func__;
+    qDebug() << "[BootloaderInstallBase] installBlFile(void)";
 }
 
 
diff --git a/rbutil/sansapatcher/sansaio.h b/rbutil/sansapatcher/sansaio.h
index d705c121b8..de25433765 100644
--- a/rbutil/sansapatcher/sansaio.h
+++ b/rbutil/sansapatcher/sansaio.h
@@ -23,7 +23,9 @@
 #define __SANSAIO_H
 
 #include <stdint.h>
-#include <unistd.h>
+#if !defined(_MSC_VER)
+#include <unistd.h> /* not available on MSVC */
+#endif
 
 #if defined(__WIN32__) || defined(_WIN32)
 #include <windows.h>