Commit 132fec1b authored by Dan Lipsa's avatar Dan Lipsa

snprintf from HDF5 conflicts with the one from GMVReader

Change-Id: I0ab3e1fc3e9e11d7aeb09a684f1d3ccc404063d8
parent 973e57a1
......@@ -698,19 +698,19 @@ Wgetlogin()
return NULL;
}
int c99_snprintf(char* str, size_t size, const char* format, ...)
int HDsnprintf(char* str, size_t size, const char* format, ...)
{
int count;
va_list ap;
va_start(ap, format);
count = c99_vsnprintf(str, size, format, ap);
count = HDvsnprintf(str, size, format, ap);
va_end(ap);
return count;
}
int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
int HDvsnprintf(char* str, size_t size, const char* format, va_list ap)
{
int count = -1;
......
......@@ -75,16 +75,15 @@ struct timezone {
#endif /* __cplusplus */
H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
H5_DLL char* Wgetlogin(void);
H5_DLL int c99_snprintf(char* str, size_t size, const char* format, ...);
H5_DLL int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap);
H5_DLL int HDsnprintf(char* str, size_t size, const char* format, ...);
H5_DLL int HDvsnprintf(char* str, size_t size, const char* format, va_list ap);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#define HDgettimeofday(V,Z) Wgettimeofday(V,Z)
#define HDgetlogin() Wgetlogin()
#define HDsnprintf c99_snprintf /*varargs*/
#define HDvsnprintf c99_vsnprintf
#define HDsnprintf HDsnprintf
#define HDvsnprintf HDvsnprintf
#endif /* H5_HAVE_VISUAL_STUDIO */
/* Non-POSIX functions */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment