summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-10-13 06:51:41 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-10-13 06:51:41 +0000
commit84913a08ed8a49cb4240b022351156453f0991b3 (patch)
tree4010ec08c061772a7bb3e2477a90f3b97e497931
parentb4b10d5d3ca6732d52ea30f78a4210fb46c1c8d9 (diff)
downloadzabbix-84913a08ed8a49cb4240b022351156453f0991b3.tar.gz
zabbix-84913a08ed8a49cb4240b022351156453f0991b3.tar.xz
zabbix-84913a08ed8a49cb4240b022351156453f0991b3.zip
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2182 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rwxr-xr-xgo20
-rw-r--r--src/libs/zbxsysinfo/common/ntp.c9
2 files changed, 15 insertions, 14 deletions
diff --git a/go b/go
index e581ffe1..654dea3e 100755
--- a/go
+++ b/go
@@ -8,17 +8,17 @@ automake
# Change ./configure options if needed
#./configure --with-mysql --prefix=/home/zabbix/zabbix --with-net-snmp
-##rm -f config.guess config.sub depcomp install-sh missing
+rm -f config.guess config.sub depcomp install-sh missing
-##cp /usr/share/automake-1.9/config.guess config.guess
-##cp /usr/share/automake-1.9/config.sub config.sub
-##cp /usr/share/automake-1.9/depcomp depcomp
-##cp /usr/share/automake-1.9/install-sh install-sh
-##cp /usr/share/automake-1.9/missing missing
-
-##cd ~zabbix
-##rm -f zabbix.tgz
-##tar cvzf zabbix.tgz zabbix
+cp /usr/share/automake-1.9/config.guess config.guess
+cp /usr/share/automake-1.9/config.sub config.sub
+cp /usr/share/automake-1.9/depcomp depcomp
+cp /usr/share/automake-1.9/install-sh install-sh
+cp /usr/share/automake-1.9/missing missing
+cd ~zabbix
+rm -f zabbix.tgz
+tar cvzf zabbix.tgz zabbix
+exit
./configure --enable-agent --enable-server --with-mysql --prefix=`pwd`
make install
diff --git a/src/libs/zbxsysinfo/common/ntp.c b/src/libs/zbxsysinfo/common/ntp.c
index 67d3788f..4ecfe10a 100644
--- a/src/libs/zbxsysinfo/common/ntp.c
+++ b/src/libs/zbxsysinfo/common/ntp.c
@@ -6,13 +6,14 @@
#include <time.h>
#include <stdio.h>
-#ifdef HAVE_SYS_TIME
- #include <sys/time.h>
-#endif
-
+#include "config.h"
#include "common.h"
#include "sysinfo.h"
+#ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+#endif
+
#define JAN_1970 2208988800.0 /* 1970 - 1900 in seconds */
#define NTP_SCALE 4294967296.0 /* 2^32, of course! */