From 6d426ac6b472d734a15213027c0f4608640920f0 Mon Sep 17 00:00:00 2001
From: "Mark A. Grondona" <mgrondona@llnl.gov>
Date: Fri, 6 Jul 2007 15:11:56 +0000
Subject: [PATCH] Ensure some stdio functions are not #define'd

---
 ChangeLog                               |  6 +++++-
 src/interposer/io-watchdog-interposer.c | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c57459f..af55fc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-06  Mark Grondona  <mgrondona@llnl.gov>
+
+	* src/interposer/io-watchdog-interposer.c : 
+	  Ensure some stdio functions are not #defined, and undef them if so.
+
 2007-07-05  Mark Grondona  <mgrondona@llnl.gov>
 
 	* io-watchdog.spec : Add BuildRequires.
@@ -13,7 +18,6 @@
 	  some overhead, it is disabled by default, and enabled via
 	  the option --exact-timeout and config parameter exact-timeout.
 
-	* : tag v0.5.
 
 2007-01-17  Mark Grondona  <mgrondona@llnl.gov>
 
diff --git a/src/interposer/io-watchdog-interposer.c b/src/interposer/io-watchdog-interposer.c
index 57a6272..cfcce2a 100644
--- a/src/interposer/io-watchdog-interposer.c
+++ b/src/interposer/io-watchdog-interposer.c
@@ -330,6 +330,9 @@ static inline void register_write_activity (int n)
         log_debug ("gettimeofday: %s\n", strerror (errno));
 }
 
+#if defined vfprintf
+#undef vfprintf
+#endif
 int vfprintf (FILE *fp, const char *fmt, va_list args)
 {
     int rc = -1;
@@ -339,6 +342,9 @@ int vfprintf (FILE *fp, const char *fmt, va_list args)
     return (rc);
 }
 
+#if defined vprintf
+#undef vprintf
+#endif
 int vprintf (const char *fmt, va_list args)
 {
     int rc = ((*ctx.ops.vprintf) (fmt, args));
@@ -347,6 +353,9 @@ int vprintf (const char *fmt, va_list args)
     return (rc);
 }
 
+#if defined fprintf
+#undef fprintf
+#endif
 int fprintf (FILE *fp, const char *fmt, ...)
 {
     int rc;
@@ -362,6 +371,9 @@ int fprintf (FILE *fp, const char *fmt, ...)
     return (rc);
 }
 
+#if defined printf
+#undef printf
+#endif
 int printf (const char *fmt, ...)
 {
     int rc;