- added ZABBIX agent for Win64 platforms. (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@3096 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 23 insertions, 23 deletions

diff --git a/src/libs/zbxsys/mutexs.c b/src/libs/zbxsys/mutexs.c
index 06ad2cb8..1bd0119c 100755
--- a/src/libs/zbxsys/mutexs.c
+++ b/src/libs/zbxsys/mutexs.c
@@ -20,7 +20,7 @@
 #include "common.h"
 #include "mutexs.h"
 
-#if !defined(WIN32)
+#if !defined(_WINDOWS)
 
 #	if !defined(semun)
 		union semun
@@ -34,7 +34,7 @@
 
 #	include "cfg.h"
 
-#endif /* not WIN32 */
+#endif /* not _WINDOWS */
 
 #include "log.h"
 
@@ -57,7 +57,7 @@
 
 int zbx_mutex_create(ZBX_MUTEX *mutex, char *name)
 {
-#if defined(WIN32)	
+#if defined(_WINDOWS)	
 
 	/* ignore "name" */
 	if(NULL == ((*mutex) = CreateMutex(NULL, FALSE, NULL)))
@@ -66,7 +66,7 @@ int zbx_mutex_create(ZBX_MUTEX *mutex, char *name)
 		return ZBX_MUTEX_ERROR;
 	}
 
-#else /* not WIN32 */
+#else /* not _WINDOWS */
 
 	key_t	sem_key;
 	int	sem_id;
@@ -95,7 +95,7 @@ int zbx_mutex_create(ZBX_MUTEX *mutex, char *name)
 
 	*mutex = sem_id;
 	
-#endif /* WIN32 */
+#endif /* _WINDOWS */
 
 	return ZBX_MUTEX_OK;
 }
@@ -120,7 +120,7 @@ int zbx_mutex_lock(ZBX_MUTEX *mutex)
 {
 
 	
-#if defined(WIN32)	
+#if defined(_WINDOWS)	
 
 	if(!*mutex) return ZBX_MUTEX_OK;
 	
@@ -130,7 +130,7 @@ int zbx_mutex_lock(ZBX_MUTEX *mutex)
 		return ZBX_MUTEX_ERROR;
 	}
 
-#else /* not WIN32 */
+#else /* not _WINDOWS */
 
 	struct sembuf sem_lock = { 0, -1, 0 };
 
@@ -142,7 +142,7 @@ int zbx_mutex_lock(ZBX_MUTEX *mutex)
 		return ZBX_MUTEX_ERROR;
 	}
 	
-#endif /* WIN32 */
+#endif /* _WINDOWS */
 
 	return ZBX_MUTEX_OK;
 }
@@ -167,7 +167,7 @@ int zbx_mutex_unlock(ZBX_MUTEX *mutex)
 {
 
 	
-#if defined(WIN32)	
+#if defined(_WINDOWS)	
 
 	if(!*mutex) return ZBX_MUTEX_OK;
 
@@ -177,7 +177,7 @@ int zbx_mutex_unlock(ZBX_MUTEX *mutex)
 		return ZBX_MUTEX_ERROR;
 	}
 
-#else /* not WIN32 */
+#else /* not _WINDOWS */
 
 	struct sembuf sem_unlock = { 0, 1, 0};
 
@@ -189,7 +189,7 @@ int zbx_mutex_unlock(ZBX_MUTEX *mutex)
 		return ZBX_MUTEX_ERROR;
 	}
 	
-#endif /* WIN32 */
+#endif /* _WINDOWS */
 
 	return ZBX_MUTEX_OK;
 }
@@ -213,7 +213,7 @@ int zbx_mutex_unlock(ZBX_MUTEX *mutex)
 int zbx_mutex_destroy(ZBX_MUTEX *mutex)
 {
 	
-#if defined(WIN32)	
+#if defined(_WINDOWS)	
 
 	if(!*mutex) return ZBX_MUTEX_OK;
 
@@ -223,13 +223,13 @@ int zbx_mutex_destroy(ZBX_MUTEX *mutex)
 		return ZBX_MUTEX_ERROR;
 	}
 
-#else /* not WIN32 */
+#else /* not _WINDOWS */
 	
 	if(!*mutex) return ZBX_MUTEX_OK;
 
 	semctl(*mutex, 0, IPC_RMID, 0);
 
-#endif /* WIN32 */
+#endif /* _WINDOWS */
 	
 	*mutex = (ZBX_MUTEX)NULL;
 
diff --git a/src/libs/zbxsys/threads.c b/src/libs/zbxsys/threads.c
index 3ae8ca05..6501d5e1 100755
--- a/src/libs/zbxsys/threads.c
+++ b/src/libs/zbxsys/threads.c
@@ -44,7 +44,7 @@ ZBX_THREAD_HANDLE zbx_thread_start(ZBX_THREAD_ENTRY_POINTER(handler), void *args
 {
 	ZBX_THREAD_HANDLE thread = 0;
 
-#if defined(WIN32)
+#if defined(_WINDOWS)
 
 	unsigned thrdaddr;
 
@@ -54,7 +54,7 @@ ZBX_THREAD_HANDLE zbx_thread_start(ZBX_THREAD_ENTRY_POINTER(handler), void *args
 		thread = (ZBX_THREAD_HANDLE)(ZBX_THREAD_ERROR);
 	}
 
-#else /* not WIN32 */
+#else /* not _WINDOWS */
 
 	thread = fork();
 
@@ -73,7 +73,7 @@ ZBX_THREAD_HANDLE zbx_thread_start(ZBX_THREAD_ENTRY_POINTER(handler), void *args
 		thread = (ZBX_THREAD_HANDLE)(ZBX_THREAD_ERROR);
 	}
 
-#endif /* WIN32 */
+#endif /* _WINDOWS */
 
 	return (ZBX_THREAD_HANDLE)(thread);
 }
@@ -96,7 +96,7 @@ ZBX_THREAD_HANDLE zbx_thread_start(ZBX_THREAD_ENTRY_POINTER(handler), void *args
 
 int zbx_thread_wait(ZBX_THREAD_HANDLE thread)
 {
-#if defined(WIN32)	
+#if defined(_WINDOWS)	
 
 	if(WaitForSingleObject(thread, INFINITE) != WAIT_OBJECT_0)
 	{
@@ -110,7 +110,7 @@ int zbx_thread_wait(ZBX_THREAD_HANDLE thread)
 		return (0);
 	}
 
-#else /* not WIN32 */
+#else /* not _WINDOWS */
 
 	if(waitpid(thread, (int *)0, 0) <= 0)
 	{
@@ -118,21 +118,21 @@ int zbx_thread_wait(ZBX_THREAD_HANDLE thread)
 		return (0);
 	}
 
-#endif /* WIN32 */
+#endif /* _WINDOWS */
 
 	return (1);
 }
 
 long int zbx_get_thread_id(void)
 {
-#if defined(WIN32)	
+#if defined(_WINDOWS)	
 
 	return (long int) GetCurrentThreadId();
 
-#else /* not WIN32 */
+#else /* not _WINDOWS */
 
 	return (long int) getpid();
 
-#endif /* WIN32 */
+#endif /* _WINDOWS */
 }