From: Julian Seward <jseward@acm.org>
Date: Tue, 15 Mar 2011 08:05:12 +0000 (+0000)
Subject: Don't apply function attributes to a functional parameter when
X-Git-Tag: svn/VALGRIND_3_7_0^2~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=744534b79f145a60fc775a04ce16e908c625f882;p=thirdparty%2Fvalgrind.git

Don't apply function attributes to a functional parameter when
being compiled by g++ 3.x, as that can't them.  Fixes #265762.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2109
---

diff --git a/VEX/pub/libvex.h b/VEX/pub/libvex.h
index 976de3abf5..84a55a8368 100644
--- a/VEX/pub/libvex.h
+++ b/VEX/pub/libvex.h
@@ -394,15 +394,25 @@ typedef
 /* Initialise the library.  You must call this first. */
 
 extern void LibVEX_Init (
+
    /* failure exit function */
+#  if __cplusplus == 1 && __GNUC__ && __GNUC__ <= 3
+   /* g++ 3.x doesn't understand attributes on function parameters.
+      See #265762. */
+#  else
    __attribute__ ((noreturn))
+#  endif
    void (*failure_exit) ( void ),
+
    /* logging output function */
    void (*log_bytes) ( HChar*, Int nbytes ),
+
    /* debug paranoia level */
    Int debuglevel,
+
    /* Are we supporting valgrind checking? */
    Bool valgrind_support,
+
    /* Control ... */
    /*READONLY*/VexControl* vcon
 );