diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-09-20 17:43:20 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-09-20 17:43:20 (GMT) |
| commit | 76dc857d807b8b63069de09ceba3ae735098407f (patch) | |
| tree | 659856eb699787b1de3f9ecbe13acdd30f998154 | |
| parent | d3b2e3cd7bfc60782a3bc4436346f8e99b41ede3 (diff) | |
| parent | db157e317ef7386f4fb232688dca0bbb49e852a0 (diff) | |
| download | hdf5-76dc857d807b8b63069de09ceba3ae735098407f.zip hdf5-76dc857d807b8b63069de09ceba3ae735098407f.tar.gz hdf5-76dc857d807b8b63069de09ceba3ae735098407f.tar.bz2 | |
Merge pull request #680 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'db157e317ef7386f4fb232688dca0bbb49e852a0':
Use define name instead.
Fix VS2013 compile error
| -rw-r--r-- | tools/test/misc/vds/UC_common.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/test/misc/vds/UC_common.h b/tools/test/misc/vds/UC_common.h index 962a091..78d8a11 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 * ******************************************/ @@ -32,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 */ |