- fixed compilation of WinXX agent

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

2 files changed, 415 insertions, 358 deletions

diff --git a/build/win32/include/config.h b/build/win32/include/config.h
index 7d6beabc..bbde10bc 100755
--- a/build/win32/include/config.h
+++ b/build/win32/include/config.h
@@ -1,6 +1,3 @@
-/* include/config.h.  Generated by configure.  */
-/* include/config.h.in.  Generated from configure.in by autoheader.  */
-
 /* Define to os name for code managing */
 #define ARCH "windows"
 
@@ -37,359 +34,17 @@
 /* Define to 1 if you have the <Winber.h> header file. */
 #define HAVE_WINBER_H 1
 
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-//#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-//#define HAVE_ARPA_NAMESER_H 1
-
-/* Define to 1 if you have the `asprintf' function. */
-//#define HAVE_ASPRINTF 1
-
-/* Define to 1 if you have the <assert.h> header file. */
-//#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the `atoll' function. */
-//#define HAVE_ATOLL 1
-
-/* Define to 1 if you have the <ctype.h> header file. */
-//#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have the <dirent.h> header file. */
-//#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-//#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-//#define HAVE_FCNTL_H 1
-
-/* Define to 1 if function 'seteuid' and 'setegid' exist. */
-//#define HAVE_FUNCTION_SETEUID 1
-
-/* Define to 1 if function 'setproctitle' exist. */
-/* #undef HAVE_FUNCTION_SETPROCTITLE */
-
-/* Define to 1 if 'KERN_BOOTTIME' exist. */
-/* #undef HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME */
-
-/* Define to 1 if 'KERN_MAXFILES' exist. */
-/* #undef HAVE_FUNCTION_SYSCTL_KERN_MAXFILES */
-
-/* Define to 1 if 'KERN_MAXPROC' exist. */
-/* #undef HAVE_FUNCTION_SYSCTL_KERN_MAXPROC */
-
-/* Define to 1 if you have the `getloadavg' function. */
-//#define HAVE_GETLOADAVG 1
-
-/* Define to 1 if you have the <getopt.h> header file. */
-//#define HAVE_GETOPT_H 1
-
-/* Define to 1 if you have the `getopt_long' function. */
-//#define HAVE_GETOPT_LONG 1
-
-/* Define to 1 if you have the `hstrerror' function. */
-//#define HAVE_HSTRERROR 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-//#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <knlist.h> header file. */
-/* #undef HAVE_KNLIST_H */
-
-/* Define to 1 if you have the <kstat.h> header file. */
-/* #undef HAVE_KSTAT_H */
-
-/* Define to 1 if you have the <kvm.h> header file. */
-/* #undef HAVE_KVM_H */
-
-/* Define to 1 if LDAP should be enabled. */
-//#define HAVE_LDAP 1
-
-/* Define to 1 if you have the <ldap.h> header file. */
-//#define HAVE_LDAP_H 1
-
-/* Define to 1 if you have the `kstat' library (-lkstat). */
-/* #undef HAVE_LIBKSTAT */
-
-/* Define to 1 if you have the `kvm' library (-lkvm). */
-/* #undef HAVE_LIBKVM */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-//#define HAVE_LIBNSL 1
-
-/* Define to 1 if you have the `resolv' library (-lresolv). */
-//#define HAVE_LIBRESOLV 1
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the <linux/kernel.h> header file. */
-//#define HAVE_LINUX_KERNEL_H 1
-
-/* Define to 1 if you have the <mach/host_info.h> header file. */
-/* #undef HAVE_MACH_HOST_INFO_H */
-
-/* Define to 1 if you have the <mach/mach_host.h> header file. */
-/* #undef HAVE_MACH_MACH_HOST_H */
-
-/* Define to 1 if you have the <memory.h> header file. */
-//#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <mtent.h> header file. */
-/* #undef HAVE_MTENT_H */
-
-/* Define to 1 if MySQL should be enabled. */
-//#define HAVE_MYSQL 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-//#define HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-//#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if NETSNMP should be enabled. */
-//#define HAVE_NETSNMP 1
-
-/* Define to 1 if you have the <net/if.h> header file. */
-//#define HAVE_NET_IF_H 1
-
-/* Define to 1 if you have the <nlist.h> header file. */
-/* #undef HAVE_NLIST_H */
-
-/* Define to 1 if Oracle should be enabled. */
-/* #undef HAVE_ORACLE */
-
-/* Define to 1 if PostgreSQL should be enabled. */
-/* #undef HAVE_POSTGRESQL */
-
-/* Define to 1 if '/proc' file system should be used. */
-//#define HAVE_PROC 1
-
-/* Define to 1 if you have the <procinfo.h> header file. */
-/* #undef HAVE_PROCINFO_H */
-
-/* Define to 1 if file '/proc/0/psinfo' should be used. */
-/* #undef HAVE_PROC_0_PSINFO */
-
-/* Define to 1 if file '/proc/1/status' should be used. */
-//#define HAVE_PROC_1_STATUS 1
-
-/* Define to 1 if file '/proc/loadavg' should be used. */
-//#define HAVE_PROC_LOADAVG 1
-
-/* Define to 1 if file /proc/net/dev' should be used. */
-//#define HAVE_PROC_NET_DEV 1
-
-/* Define to 1 if file '/proc/stat' should be used. */
-//#define HAVE_PROC_STAT 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-//#define HAVE_PWD_H 1
-
-/* Define to 1 if you have the <resolv.h> header file. */
-//#define HAVE_RESOLV_H 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-//#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if SNMP should be enabled. */
-//#define HAVE_SNMP 1
-
-/* Define to 1 if you have the `snprintf' function. */
-//#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the `socket' function. */
-//#define HAVE_SOCKET 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-//#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-//#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-//#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-//#define HAVE_STRINGS_H 1
-
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define to 1 if you have the `strtod' function. */
-//#define HAVE_STRTOD 1
-
-/* Define to 1 if 'sysinfo.bufferram' exist. */
-//#define HAVE_SYSINFO_BUFFERRAM 1
-
-/* Define to 1 if 'sysinfo.freeram' exist. */
-//#define HAVE_SYSINFO_FREERAM 1
-
-/* Define to 1 if 'sysinfo.freeswap' exist. */
-//#define HAVE_SYSINFO_FREESWAP 1
-
-/* Define to 1 if 'sysinfo.mem_unit' exist. */
-//#define HAVE_SYSINFO_MEM_UNIT 1
-
-/* Define to 1 if 'sysinfo.procs' exist. */
-//#define HAVE_SYSINFO_PROCS 1
-
-/* Define to 1 if 'sysinfo.sharedram' exist. */
-//#define HAVE_SYSINFO_SHAREDRAM 1
-
-/* Define to 1 if 'sysinfo.totalram' exist. */
-//#define HAVE_SYSINFO_TOTALRAM 1
-
-/* Define to 1 if 'sysinfo.totalswap' exist. */
-//#define HAVE_SYSINFO_TOTALSWAP 1
-
-/* Define to 1 if 'sysinfo.uptime' exist. */
-//#define HAVE_SYSINFO_UPTIME 1
-
-/* Define to 1 if you have the <syslog.h> header file. */
-//#define HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <sys/disk.h> header file. */
-/* #undef HAVE_SYS_DISK_H */
-
-/* Define to 1 if you have the <sys/dkstat.h> header file. */
-/* #undef HAVE_SYS_DKSTAT_H */
-
-/* Define to 1 if you have the <sys/dk.h> header file. */
-/* #undef HAVE_SYS_DK_H */
-
-/* Define to 1 if you have the <sys/loadavg.h> header file. */
-/* #undef HAVE_SYS_LOADAVG_H */
-
-/* Define to 1 if you have the <sys/mount.h> header file. */
-//#define HAVE_SYS_MOUNT_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-//#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/procfs.h> header file. */
-//#define HAVE_SYS_PROCFS_H 1
-
-/* Define to 1 if you have the <sys/proc.h> header file. */
-/* #undef HAVE_SYS_PROC_H */
-
-/* Define to 1 if you have the <sys/pstat.h> header file. */
-/* #undef HAVE_SYS_PSTAT_H */
-
-/* Define to 1 if function 'setpriority' exist. */
-//#define HAVE_SYS_RESOURCE_SETPRIORITY 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-//#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-//#define HAVE_SYS_STATVFS_H 1
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
-/* Define to 1 if you have the <sys/swap.h> header file. */
-//#define HAVE_SYS_SWAP_H 1
-
-/* Define to 1 if struct 'swaptable' exist. */
-/* #undef HAVE_SYS_SWAP_SWAPTABLE */
-
-/* Define to 1 if you have the <sys/syscall.h> header file. */
-//#define HAVE_SYS_SYSCALL_H 1
-
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-//#define HAVE_SYS_SYSCTL_H 1
-
-/* Define to 1 if you have the <sys/sysinfo.h> header file. */
-//#define HAVE_SYS_SYSINFO_H 1
-
 /* Define to 1 if you have the <math.h> header file. */
 #define HAVE_MATH_H 1
 
-/* Define to 1 if you have the <sys/sysmacros.h> header file. */
-//#define HAVE_SYS_SYSMACROS_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-//#define HAVE_SYS_TIME_H 1
-
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define to 1 if you have the <sys/var.h> header file. */
-/* #undef HAVE_SYS_VAR_H */
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-//#define HAVE_SYS_VFS_H 1
-
-/* Define to 1 if you have the <sys/vmmeter.h> header file. */
-/* #undef HAVE_SYS_VMMETER_H */
-
-/* Define to 1 if struct 'vmtotal' exist . */
-/* #undef HAVE_SYS_VMMETER_VMTOTAL */
-
 /* Define to 1 if you have the <time.h> header file. */
 #define HAVE_TIME_H 1
-
-/* Define to 1 if UCDSNMP should be enabled. */
-/* #undef HAVE_UCDSNMP */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-//#define HAVE_UNISTD_H 1
-
-/* Define to 1 if function 'sysconf' exist. */
-//#define HAVE_UNISTD_SYSCONF 1
-
-/* Define to 1 if you have the `vasprintf' function. */
-//#define HAVE_VASPRINTF 1
-
-/* Define to 1 if you have the <vm/vm_param.h> header file. */
-/* #undef HAVE_VM_VM_PARAM_H */
-
-/* Define to 1 if you have the `vsnprintf' function. */
-//#define HAVE_VSNPRINTF 1
-
-/* Define to 1 if function '__va_copy' exist. */
-//#define HAVE___VA_COPY 1
-
-/* Define to 1 if you're using Linux 2.4.x */
-/* #undef KERNEL_2_4 */
-
-/* Define to 1 if you're using Linux 2.6.x */
-//#define KERNEL_2_6 1
-
-/* Name of package */
-//#define PACKAGE "zabbix"
-
-/* Define to the address where bug reports for this package should be sent. */
-//#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-//#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-//#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-//#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-//#define PACKAGE_VERSION ""
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-//#define RETSIGTYPE void
-
-/* Define to 1 if you have the ANSI C header files. */
-//#define STDC_HEADERS 1
-
-/* Version number of package */
-//#define VERSION "1.1patch1"
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-/* Define socklen_t type */
-/* #undef socklen_t */
diff --git a/build/win32/project/zabbix_agentd.dsp b/build/win32/project/zabbix_agentd.dsp
index c0a9a482..b8c8f3ee 100644
--- a/build/win32/project/zabbix_agentd.dsp
+++ b/build/win32/project/zabbix_agentd.dsp
@@ -48,7 +48,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /GX /O2 /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FR /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /D "WITH_COMMON_METRICS" /D "WITH_SPECIFIC_METRICS" /FR /YX /FD /c

 # ADD BASE RSC /l 0x419 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FR /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /D "WITH_COMMON_METRICS" /D "WITH_SPECIFIC_METRICS" /D "WITH_SIMPLE_METRICS" /FR /YX /FD /GZ /c

 # ADD BASE RSC /l 0x419 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -97,7 +97,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include/" /I "../../../include/" /D "_DEBUG" /D "HAVE_ASSERT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "TODO" /D "WIN32" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FR /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "TODO" /D "WIN32" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /D "WITH_COMMON_METRICS" /D "WITH_SPECIFIC_METRICS" /FR /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /fo"Debug/zabbixw32.res" /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -122,7 +122,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "HAVE_ASSERT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "ZABBIX_TEST" /D "WIN32" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FR /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "ZABBIX_TEST" /D "WIN32" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /D "WITH_COMMON_METRICS" /D "WITH_SPECIFIC_METRICS" /FR /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /fo"Debug/zabbixw32.res" /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -147,7 +147,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FR /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "_WIN64" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FD /Wp64 /c

+# ADD CPP /nologo /MTd /W3 /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "_WIN64" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /D "WITH_COMMON_METRICS" /D "WITH_SPECIFIC_METRICS" /FD /Wp64 /c

 # SUBTRACT CPP /Fr

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -174,7 +174,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "NDEBUG" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FR /YX /FD /c

-# ADD CPP /nologo /MT /W3 /O2 /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "NDEBUG" /D "_WIN64" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FD /Wp64 /c

+# ADD CPP /nologo /MT /W3 /O2 /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "NDEBUG" /D "_WIN64" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /D "WITH_COMMON_METRICS" /D "WITH_SPECIFIC_METRICS" /FD /Wp64 /c

 # SUBTRACT CPP /Fr

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -201,7 +201,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "ZABBIX_TEST" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FR /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "ZABBIX_TEST" /D "_WIN64" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FR /FD /Wp64 /c

+# ADD CPP /nologo /MTd /W3 /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "ZABBIX_TEST" /D "_WIN64" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /D "WITH_COMMON_METRICS" /D "WITH_SPECIFIC_METRICS" /FR /FD /Wp64 /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -227,7 +227,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "TODO" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FR /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "TODO" /D "_WIN64" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /FR /FD /Wp64 /c

+# ADD CPP /nologo /MTd /W3 /Od /I "./" /I "../include/" /I "../../../include/" /I "../../../src/zabbix_agent" /D "_DEBUG" /D "TODO" /D "_WIN64" /D "_WINDOWS" /D "HAVE_LDAP" /D "HAVE_ASSERT_H" /D "_CONSOLE" /D "_MBCS" /D "ZABBIX_SERVICE" /D "WITH_COMMON_METRICS" /D "WITH_SPECIFIC_METRICS" /FR /FD /Wp64 /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -5738,10 +5738,6 @@ SOURCE=..\..\..\src\libs\zbxsysinfo\win32\swap.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\src\libs\zbxsysinfo\win32\system_w32.c

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\..\src\libs\zbxsysinfo\win32\uptime.c

 # End Source File

 # Begin Source File

@@ -5755,24 +5751,422 @@ SOURCE=..\..\..\src\libs\zbxsysinfo\win32\win32.c
 # Begin Source File

 

 SOURCE=..\..\..\src\libs\zbxsysinfo\common\common.c

+

+!IF  "$(CFG)" == "zabbix_agentd - Win32 Release"

+

+# PROP Intermediate_Dir "Release/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug"

+

+# PROP Intermediate_Dir "Debug/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO"

+

+# PROP Intermediate_Dir "TODO/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test"

+

+# PROP Intermediate_Dir "Test/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug AMD64"

+

+# PROP Intermediate_Dir "Debug_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Release AMD64"

+

+# PROP Intermediate_Dir "Release_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test AMD64"

+

+# PROP Intermediate_Dir "Test_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO AMD64"

+

+# PROP Intermediate_Dir "TODO_AMD64/sysinfo/common/"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\common\common.h

+

+!IF  "$(CFG)" == "zabbix_agentd - Win32 Release"

+

+# PROP Intermediate_Dir "Release/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug"

+

+# PROP Intermediate_Dir "Debug/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO"

+

+# PROP Intermediate_Dir "TODO/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test"

+

+# PROP Intermediate_Dir "Test/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug AMD64"

+

+# PROP Intermediate_Dir "Debug_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Release AMD64"

+

+# PROP Intermediate_Dir "Release_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test AMD64"

+

+# PROP Intermediate_Dir "Test_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO AMD64"

+

+# PROP Intermediate_Dir "TODO_AMD64/sysinfo/common/"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=..\..\..\src\libs\zbxsysinfo\common\file.c

+

+!IF  "$(CFG)" == "zabbix_agentd - Win32 Release"

+

+# PROP Intermediate_Dir "Release/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug"

+

+# PROP Intermediate_Dir "Debug/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO"

+

+# PROP Intermediate_Dir "TODO/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test"

+

+# PROP Intermediate_Dir "Test/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug AMD64"

+

+# PROP Intermediate_Dir "Debug_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Release AMD64"

+

+# PROP Intermediate_Dir "Release_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test AMD64"

+

+# PROP Intermediate_Dir "Test_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO AMD64"

+

+# PROP Intermediate_Dir "TODO_AMD64/sysinfo/common/"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\common\file.h

+

+!IF  "$(CFG)" == "zabbix_agentd - Win32 Release"

+

+# PROP Intermediate_Dir "Release/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug"

+

+# PROP Intermediate_Dir "Debug/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO"

+

+# PROP Intermediate_Dir "TODO/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test"

+

+# PROP Intermediate_Dir "Test/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug AMD64"

+

+# PROP Intermediate_Dir "Debug_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Release AMD64"

+

+# PROP Intermediate_Dir "Release_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test AMD64"

+

+# PROP Intermediate_Dir "Test_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO AMD64"

+

+# PROP Intermediate_Dir "TODO_AMD64/sysinfo/common/"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=..\..\..\src\libs\zbxsysinfo\common\http.c

+

+!IF  "$(CFG)" == "zabbix_agentd - Win32 Release"

+

+# PROP Intermediate_Dir "Release/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug"

+

+# PROP Intermediate_Dir "Debug/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO"

+

+# PROP Intermediate_Dir "TODO/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test"

+

+# PROP Intermediate_Dir "Test/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug AMD64"

+

+# PROP Intermediate_Dir "Debug_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Release AMD64"

+

+# PROP Intermediate_Dir "Release_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test AMD64"

+

+# PROP Intermediate_Dir "Test_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO AMD64"

+

+# PROP Intermediate_Dir "TODO_AMD64/sysinfo/common/"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\src\libs\zbxsysinfo\common\ntp.c

+SOURCE=..\..\..\src\libs\zbxsysinfo\common\http.h

+

+!IF  "$(CFG)" == "zabbix_agentd - Win32 Release"

+

+# PROP Intermediate_Dir "Release/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug"

+

+# PROP Intermediate_Dir "Debug/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO"

+

+# PROP Intermediate_Dir "TODO/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test"

+

+# PROP Intermediate_Dir "Test/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug AMD64"

+

+# PROP Intermediate_Dir "Debug_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Release AMD64"

+

+# PROP Intermediate_Dir "Release_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test AMD64"

+

+# PROP Intermediate_Dir "Test_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO AMD64"

+

+# PROP Intermediate_Dir "TODO_AMD64/sysinfo/common/"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\common\net.c

+

+!IF  "$(CFG)" == "zabbix_agentd - Win32 Release"

+

+# PROP Intermediate_Dir "Release/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug"

+

+# PROP Intermediate_Dir "Debug/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO"

+

+# PROP Intermediate_Dir "TODO/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test"

+

+# PROP Intermediate_Dir "Test/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug AMD64"

+

+# PROP Intermediate_Dir "Debug_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Release AMD64"

+

+# PROP Intermediate_Dir "Release_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test AMD64"

+

+# PROP Intermediate_Dir "Test_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO AMD64"

+

+# PROP Intermediate_Dir "TODO_AMD64/sysinfo/common/"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\common\net.h

+

+!IF  "$(CFG)" == "zabbix_agentd - Win32 Release"

+

+# PROP Intermediate_Dir "Release/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug"

+

+# PROP Intermediate_Dir "Debug/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO"

+

+# PROP Intermediate_Dir "TODO/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test"

+

+# PROP Intermediate_Dir "Test/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug AMD64"

+

+# PROP Intermediate_Dir "Debug_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Release AMD64"

+

+# PROP Intermediate_Dir "Release_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test AMD64"

+

+# PROP Intermediate_Dir "Test_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO AMD64"

+

+# PROP Intermediate_Dir "TODO_AMD64/sysinfo/common/"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=..\..\..\src\libs\zbxsysinfo\common\system.c

+

+!IF  "$(CFG)" == "zabbix_agentd - Win32 Release"

+

+# PROP Intermediate_Dir "Release/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug"

+

+# PROP Intermediate_Dir "Debug/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO"

+

+# PROP Intermediate_Dir "TODO/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test"

+

+# PROP Intermediate_Dir "Test/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug AMD64"

+

+# PROP Intermediate_Dir "Debug_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Release AMD64"

+

+# PROP Intermediate_Dir "Release_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test AMD64"

+

+# PROP Intermediate_Dir "Test_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO AMD64"

+

+# PROP Intermediate_Dir "TODO_AMD64/sysinfo/common/"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\common\system.h

+

+!IF  "$(CFG)" == "zabbix_agentd - Win32 Release"

+

+# PROP Intermediate_Dir "Release/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug"

+

+# PROP Intermediate_Dir "Debug/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO"

+

+# PROP Intermediate_Dir "TODO/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test"

+

+# PROP Intermediate_Dir "Test/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Debug AMD64"

+

+# PROP Intermediate_Dir "Debug_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Release AMD64"

+

+# PROP Intermediate_Dir "Release_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 Test AMD64"

+

+# PROP Intermediate_Dir "Test_AMD64/sysinfo/common/"

+

+!ELSEIF  "$(CFG)" == "zabbix_agentd - Win32 TODO AMD64"

+

+# PROP Intermediate_Dir "TODO_AMD64/sysinfo/common/"

+

+!ENDIF 

+

 # End Source File

 # End Group

+# Begin Group "simple"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\simple\ntp.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\simple\ntp.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\simple\simple.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\simple\simple.h

+# End Source File

+# End Group

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\specsysinfo.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\libs\zbxsysinfo\sysinfo.c

+# End Source File

 # End Group

 # Begin Group "zbxwin32"

 

@@ -5994,6 +6388,10 @@ SOURCE=..\..\..\src\zabbix_agent\stats.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\zabbix_agent\zabbix_agent.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\zabbix_agent\zabbix_agentd.c

 # End Source File

 # Begin Source File

@@ -6118,6 +6516,10 @@ SOURCE=..\..\..\include\zlog.h
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

 # Begin Source File

 

+SOURCE=.\messages.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\messages.mc

 

 !IF  "$(CFG)" == "zabbix_agentd - Win32 Release"