Changeset 757 for trunk/zoo-project/zoo-kernel/service.h

Timestamp:

Apr 20, 2016, 11:51:55 AM (8 years ago)

Author:

djay

Message:

Update the makefiles and small fixe for windows platform.

File:

• trunk/zoo-project/zoo-kernel/service.h (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/service.h

@@ -35 +35 @@
 
 #ifdef WIN32
-#ifndef USE_MS
 #define strncasecmp _strnicmp
 #define strcasecmp _stricmp
-//#else
-//#define snprintf sprintf_s
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define snprintf _snprintf
 #endif
 #define zStrdup _strdup
@@ -324 +323 @@
   ZOO_DLL_EXPORT void mapsToCharXXX(maps*,char***);
   ZOO_DLL_EXPORT void charxxxToMaps(char***,maps**);
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1800
   // snprintf for Visual Studio compiler;
   // it is also used by services (e.g., GetStatus), therefore exported to shared library
   ZOO_DLL_EXPORT int snprintf(char *buffer, size_t n, const char *format, ...);
-#endif  
+#endif
 #ifdef __cplusplus
 }