- fixed compile error on Red Hat 5.x which occurred if using GNU compiler with -D_FORTIFY_SOURCE=2

(wrap __fprintf_chk() instread of fprintf())
- incremented VT version number in docu

This commit was SVN r23898.

ompi/contrib/vt/vt/ChangeLog

@@ -1,3 +1,7 @@
+5.8.3openmpi
+	- fixed compile error on Red Hat 5.x which occurred if using GNU
+	  compiler with -D_FORTIFY_SOURCE=2
+
 5.8.2openmpi
 	- fixed buffer overflow which occurred if marker or event comment
 	  records generated

ompi/contrib/vt/vt/VERSION

@@ -1 +1 @@
-5.8.2openmpi
+5.8.3openmpi

ompi/contrib/vt/vt/config/m4/acinclude.iowrap.m4

@@ -11,6 +11,7 @@ AC_DEFUN([ACVT_IOWRAP],
 		sav_CPPFLAGS=$CPPFLAGS
 		CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
 		AC_CHECK_FUNCS([ \
+			__fprintf_chk \
 			creat64 \
 			fopen64 \
 			fseeko \

ompi/contrib/vt/vt/doc/UserManual.html

@@ -62,7 +62,7 @@ body {font-family: sans-serif;}
 <P>
 
 <P>
-<B><BIG CLASS="XHUGE">VampirTrace 5.8.2 User Manual</BIG></B>
+<B><BIG CLASS="XHUGE">VampirTrace 5.8.3 User Manual</BIG></B>
 <BR>
 <BR>
 <BR>

ompi/contrib/vt/vt/vtlib/vt_iowrap.c

@@ -1392,7 +1392,11 @@ int fscanf(FILE *stream, const char *format, ...)
 }
 
 
+#if defined(HAVE___FPRINTF_CHK) && HAVE___FPRINTF_CHK
+int __fprintf_chk(FILE *stream, int flag, const char *format, ...)
+#else /* HAVE___FPRINTF_CHK */
 int fprintf(FILE *stream, const char *format, ...)
+#endif /* HAVE___FPRINTF_CHK */
 {
 #define VT_IOWRAP_THISFUNCNAME fprintf
 	int ret;
@@ -1410,7 +1414,11 @@ int fprintf(FILE *stream, const char *format, ...)
 	
 		vt_debug_msg(DBG_IO, "vfprintf");
 		va_start (arg, format);
-		ret = vfprintf(stream, format, arg);
+#if defined(HAVE___FPRINTF_CHK) && HAVE___FPRINTF_CHK
+		ret = __vfprintf_chk(stream, flag, format, arg);
+#else /* HAVE___FPRINTF_CHK */
+		ret = fprintf(stream, format, arg);
+#endif /* HAVE___FPRINTF_CHK */
 		va_end (arg);
 	
 		num_bytes = (ssize_t)ret;
@@ -1421,7 +1429,11 @@ int fprintf(FILE *stream, const char *format, ...)
 	}
 	else {
 		va_start (arg, format);
+#if defined(HAVE___FPRINTF_CHK) && HAVE___FPRINTF_CHK
+		ret = __vfprintf_chk(stream, flag, format, arg);
+#else /* HAVE___FPRINTF_CHK */
 		ret = vfprintf(stream, format, arg);
+#endif /* HAVE___FPRINTF_CHK */
 		va_end (arg);
 		return ret;
 	}