summaryrefslogtreecommitdiffstats
path: root/src/openvpn/options.c
diff options
context:
space:
mode:
authorAlon Bar-Lev <alon.barlev@gmail.com>2012-02-29 22:12:15 +0200
committerDavid Sommerseth <davids@redhat.com>2012-03-22 22:53:39 +0100
commit3d163bc544ab9dfc62d9a2c865f8abb865bf6eb3 (patch)
treed4ec60463290c45c2b201797099214d854edc042 /src/openvpn/options.c
parentdc81e743989640cc681a40e69455cc9fc736ab9c (diff)
downloadopenvpn-3d163bc544ab9dfc62d9a2c865f8abb865bf6eb3.tar.gz
openvpn-3d163bc544ab9dfc62d9a2c865f8abb865bf6eb3.tar.xz
openvpn-3d163bc544ab9dfc62d9a2c865f8abb865bf6eb3.zip
build: move gettimeofday() emulation to compat
Remove all references to gettimeofday() from main project. SIDE EFFECT: mingw will use its own internal gettimeofday(). Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> Acked-by: David Sommerseth <davids@redhat.com> Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'src/openvpn/options.c')
-rw-r--r--src/openvpn/options.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 842f72c..258b060 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -1455,7 +1455,7 @@ show_settings (const struct options *o)
SHOW_INT (ifconfig_ipv6_netbits);
SHOW_STR (ifconfig_ipv6_remote);
-#ifdef HAVE_GETTIMEOFDAY
+#ifdef ENABLE_FEATURE_SHAPER
SHOW_INT (shaper);
#endif
#ifdef ENABLE_OCC
@@ -4833,7 +4833,7 @@ add_option (struct options *options,
}
else if (streq (p[0], "shaper") && p[1])
{
-#ifdef HAVE_GETTIMEOFDAY
+#ifdef ENABLE_FEATURE_SHAPER
int shaper;
VERIFY_PERMISSION (OPT_P_SHAPER);
@@ -4845,11 +4845,11 @@ add_option (struct options *options,
goto err;
}
options->shaper = shaper;
-#else /* HAVE_GETTIMEOFDAY */
+#else /* ENABLE_FEATURE_SHAPER */
VERIFY_PERMISSION (OPT_P_GENERAL);
msg (msglevel, "--shaper requires the gettimeofday() function which is missing");
goto err;
-#endif /* HAVE_GETTIMEOFDAY */
+#endif /* ENABLE_FEATURE_SHAPER */
}
else if (streq (p[0], "port") && p[1])
{