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

Timestamp:

Jun 30, 2015, 4:49:08 PM (9 years ago)

Author:

knut

Message:

Added snprintf for Visual Studio compiler. In readVSIFile(), changed type of file_status variable to VSIStatBufL. Some minor changes neccessary for building on Windows, particularly in service_internal_php.c. Added PHP support in Windows makefile.

File:

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

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

@@ -38 +38 @@
 #define strncasecmp _strnicmp
 #define strcasecmp _stricmp
-#else
-#define snprintf sprintf_s
+//#else
+//#define snprintf sprintf_s
 #endif
 #define zStrdup _strdup
@@ -64 +64 @@
   return 0; // The gettimeofday() function shall return 0 on success
 }
+
 #else
 /**
@@ -106 +107 @@
 #include <stdlib.h>
 #include <ctype.h>
-#ifndef WIN32
+
 #include <stdio.h>
-#endif
+
 #include <string.h>
 #ifndef WIN32
@@ -323 +324 @@
   ZOO_DLL_EXPORT void mapsToCharXXX(maps*,char***);
   ZOO_DLL_EXPORT void charxxxToMaps(char***,maps**);
-
+#ifdef _MSC_VER
+  // 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  
 #ifdef __cplusplus
 }