Merge r6036 (fix for: valgrind header files are not standard C)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6037

diff --git a/include/valgrind.h b/include/valgrind.h
index a0dce038463c9ca7f04a56ff17f1a750c9475754..3483d9e3375fb9b92f9a68409b04906ed2d8b81d 100644 (file)
--- a/include/valgrind.h
+++ b/include/valgrind.h
@@ -2296,7 +2296,7 @@ typedef
           /* Stack support. */
           VG_USERREQ__STACK_REGISTER   = 0x1501,
           VG_USERREQ__STACK_DEREGISTER = 0x1502,
-          VG_USERREQ__STACK_CHANGE     = 0x1503,
+          VG_USERREQ__STACK_CHANGE     = 0x1503
    } Vg_ClientRequest;
 
 #if !defined(__GNUC__)
@@ -2376,6 +2376,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
 /* These requests allow control to move from the simulated CPU to the
    real CPU, calling an arbitary function */
 #define VALGRIND_NON_SIMD_CALL0(_qyy_fn)                          \
+   __extension__                                                  \
    ({unsigned long _qyy_res;                                      \
     VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
                                VG_USERREQ__CLIENT_CALL0,          \
@@ -2385,6 +2386,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
    })
 
 #define VALGRIND_NON_SIMD_CALL1(_qyy_fn, _qyy_arg1)               \
+   __extension__                                                  \
    ({unsigned long _qyy_res;                                      \
     VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
                                VG_USERREQ__CLIENT_CALL1,          \
@@ -2394,6 +2396,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
    })
 
 #define VALGRIND_NON_SIMD_CALL2(_qyy_fn, _qyy_arg1, _qyy_arg2)    \
+   __extension__                                                  \
    ({unsigned long _qyy_res;                                      \
     VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
                                VG_USERREQ__CLIENT_CALL2,          \
@@ -2403,6 +2406,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
    })
 
 #define VALGRIND_NON_SIMD_CALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3) \
+   __extension__                                                  \
    ({unsigned long _qyy_res;                                      \
     VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
                                VG_USERREQ__CLIENT_CALL3,          \
@@ -2417,6 +2421,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
    the tool must record the errors with VG_(maybe_record_error)() or
    VG_(unique_error)() for them to be counted. */
 #define VALGRIND_COUNT_ERRORS                                     \
+   __extension__                                                  \
    ({unsigned int _qyy_res;                                       \
     VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
                                VG_USERREQ__COUNT_ERRORS,          \