[Spice-devel,vdagent-win,V3,05/11] vdcommon.h: do not redefine _ftime_s

Submitted by Uri Lublin on Dec. 30, 2014, 4:20 p.m.

Details

Message ID c678c4f26b6139b64689c6785ddf729134697f58.1419954144.git.uril@redhat.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Uri Lublin Dec. 30, 2014, 4:20 p.m.
Fixes the following error:

Patch hide | download patch | download mbox

====
In file included from vdagent/vdagent.cpp:18:0:
./common/vdcommon.h:51:0: warning: "_ftime_s" redefined
 #define _ftime_s(timeb) _ftime(timeb)
 ^
In file included from /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/timeb.h:124:0,
=====
---
 common/vdcommon.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/common/vdcommon.h b/common/vdcommon.h
index 3d0f794..6ab18c6 100644
--- a/common/vdcommon.h
+++ b/common/vdcommon.h
@@ -65,8 +65,10 @@  typedef CRITICAL_SECTION mutex_t;
 #endif
 
 #ifdef OLDMSVCRT
+#ifndef _ftime_s
 #define _ftime_s(timeb) _ftime(timeb)
 #endif
+#endif
 
 enum SystemVersion {
     SYS_VER_UNSUPPORTED,