From 9e9d2ccd40707ea966bd3e209b33a0c029ada1e4 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 20 Sep 2017 09:52:44 -0500
Subject: Fix VS2013 compile error

---
 tools/test/misc/vds/UC_common.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/test/misc/vds/UC_common.h b/tools/test/misc/vds/UC_common.h
index 962a091..c3fdb91 100644
--- a/tools/test/misc/vds/UC_common.h
+++ b/tools/test/misc/vds/UC_common.h
@@ -14,6 +14,15 @@
 #ifndef USE_CASE_COMMON_H
 #define USE_CASE_COMMON_H
 
+/* Use FUNC to safely handle variations of C99 __func__ keyword handling */
+#ifdef H5_HAVE_C99_FUNC
+#define FUNC __func__
+#elif defined(H5_HAVE_FUNCTION)
+#define FUNC __FUNCTION__
+#else
+#error "We need __func__ or __FUNCTION__ to test function names!"
+#endif
+
 /******************************************
  * Symbols used across multiple use cases *
  ******************************************/
-- 
cgit v0.12


From db157e317ef7386f4fb232688dca0bbb49e852a0 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 20 Sep 2017 11:51:21 -0500
Subject: Use define name instead.

---
 tools/test/misc/vds/UC_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/test/misc/vds/UC_common.h b/tools/test/misc/vds/UC_common.h
index c3fdb91..78d8a11 100644
--- a/tools/test/misc/vds/UC_common.h
+++ b/tools/test/misc/vds/UC_common.h
@@ -41,7 +41,7 @@
 #define FALSE 0
 
 /* Testing macros */
-#define AT()        printf ("   at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);
+#define AT()        printf ("   at %s:%d in %s()...\n", __FILE__, __LINE__, FUNC);
 #define UC_ERROR    {puts("*ERROR*"); fflush(stdout); AT(); goto error;}
 
 #endif /* USE_CASE_COMMON_H */
-- 
cgit v0.12