From: Bart Van Assche <bvanassche@acm.org>
Date: Wed, 1 Sep 2010 10:18:36 +0000 (+0000)
Subject: Suppressed a few warnings reported by the Microsoft C Compiler.
X-Git-Tag: svn/VALGRIND_3_6_0~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=661ab8260d1298253f287e209e192000a6f080af;p=thirdparty%2Fvalgrind.git

Suppressed a few warnings reported by the Microsoft C Compiler.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11314
---

diff --git a/include/valgrind.h b/include/valgrind.h
index 4f0f4de24b..91fbeec36a 100644
--- a/include/valgrind.h
+++ b/include/valgrind.h
@@ -4283,16 +4283,27 @@ static int VALGRIND_PRINTF(const char *format, ...)
    __attribute__((format(__printf__, 1, 2), __unused__));
 #endif
 static int
+#if defined(_MSC_VER)
+__inline
+#endif
 VALGRIND_PRINTF(const char *format, ...)
 {
    unsigned long _qzz_res;
    va_list vargs;
    va_start(vargs, format);
+#if defined(_MSC_VER)
+   VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,
+                              VG_USERREQ__PRINTF_VALIST_BY_REF,
+                              (ptrdiff_t)format,
+                              (ptrdiff_t)&vargs,
+                              0, 0, 0);
+#else
    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,
                               VG_USERREQ__PRINTF_VALIST_BY_REF,
                               (unsigned long)format,
                               (unsigned long)&vargs, 
                               0, 0, 0);
+#endif
    va_end(vargs);
    return (int)_qzz_res;
 }
@@ -4302,16 +4313,27 @@ static int VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
    __attribute__((format(__printf__, 1, 2), __unused__));
 #endif
 static int
+#if defined(_MSC_VER)
+__inline
+#endif
 VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
 {
    unsigned long _qzz_res;
    va_list vargs;
    va_start(vargs, format);
+#if defined(_MSC_VER)
+   VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,
+                              VG_USERREQ__PRINTF_BACKTRACE_VALIST_BY_REF,
+                              (ptrdiff_t)format,
+                              (ptrdiff_t)&vargs,
+                              0, 0, 0);
+#else
    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,
                               VG_USERREQ__PRINTF_BACKTRACE_VALIST_BY_REF,
                               (unsigned long)format,
                               (unsigned long)&vargs, 
                               0, 0, 0);
+#endif
    va_end(vargs);
    return (int)_qzz_res;
 }