[ovs-dev] [PATCH V3] windefs: common include for MSVC
Ben Pfaff
blp at nicira.com
Fri Dec 27 16:00:13 UTC 2013
On Thu, Dec 19, 2013 at 06:23:12PM +0000, Alin Serdean wrote:
> Signed-off-by: Alin Serdean <aserdean at cloudbasesolutions.com>
I think that this is about ready to go.
strtok_r should be defined in string.h.in.
We already have workarounds for snprintf and vsnprintf in stdio.h.in.
So, I folded in the following incremental and will apply this to master
in a minute:
diff --git a/include/windows/windefs.h b/include/windows/windefs.h
index 54e44a5..dcfa20b 100644
--- a/include/windows/windefs.h
+++ b/include/windows/windefs.h
@@ -24,7 +24,6 @@
#include <BaseTsd.h>
#define inline __inline
-#define strtok_r strtok_s
#define __func__ __FUNCTION__
#define ssize_t SSIZE_T
#define u_int8_t uint8_t
diff --git a/lib/string.h.in b/lib/string.h.in
index bc87fbf..9e8fba9 100644
--- a/lib/string.h.in
+++ b/lib/string.h.in
@@ -32,7 +32,7 @@
#endif
#ifdef _WIN32
-#define snprintf _snprintf
+#define strtok_r strtok_s
#define strcasecmp _stricmp
#define strncasecmp _strnicmp
#endif
More information about the dev
mailing list