commit d3beee649ffe7c2879b7b3616d33d6e813e28dbd
author Igor Murashkin <iam@google.com> Wed Oct 30 18:35:39 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 30 18:35:39 2013 -0700
tree 881816f15a05762e358e6827b092179e5a74d2f6
parent ce510d40c209a627d06573a9b32f3e0eb941d3a4
parent e65b7ea8801145626504c724c28aedd0e5038a28

am e65b7ea8: utils: Fix broken sdk build on windows

* commit 'e65b7ea8801145626504c724c28aedd0e5038a28':
  utils: Fix broken sdk build on windows

libutils/Printer.cpp

diff --git a/libutils/Printer.cpp b/libutils/Printer.cpp
index b062ef0..ac729e0 100644
--- a/libutils/Printer.cpp
+++ b/libutils/Printer.cpp
@@ -47,10 +47,16 @@
     va_start(arglist, format);
 
     char* formattedString;
+
+#ifndef USE_MINGW
     if (vasprintf(&formattedString, format, arglist) < 0) { // returns -1 on error
         ALOGE("%s: Failed to format string", __FUNCTION__);
         return;
     }
+#else
+    return;
+#endif
+
     va_end(arglist);
 
     printLine(formattedString);
@@ -113,7 +119,9 @@
         return;
     }
 
+#ifndef USE_MINGW
     fdprintf(mFd, mFormatString, mPrefix, string);
+#endif
 }
 
 /*

libutils/ProcessCallStack.cpp

diff --git a/libutils/ProcessCallStack.cpp b/libutils/ProcessCallStack.cpp
index e202b9c..f9340c5 100644
--- a/libutils/ProcessCallStack.cpp
+++ b/libutils/ProcessCallStack.cpp
@@ -140,6 +140,7 @@
     clear();
 
     // Get current time.
+#ifndef USE_MINGW
     {
         time_t t = time(NULL);
         struct tm tm;
@@ -193,6 +194,7 @@
         ALOGE("%s: Failed to readdir from %s (errno = %d, '%s')",
               __FUNCTION__, PATH_SELF_TASK, -code, strerror(code));
     }
+#endif
 
     closedir(dp);
 }