From 946b73abd8b391049b1c3c55ce75cb958fbc6dbb Mon Sep 17 00:00:00 2001 From: oetiker Date: Thu, 4 Dec 2008 15:48:39 +0000 Subject: [PATCH] fix merg error with win32 port git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1692 a5681a0c-68f1-0310-ab6d-d61299d08faa --- src/rrd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rrd.h b/src/rrd.h index 90286d1..c68421f 100644 --- a/src/rrd.h +++ b/src/rrd.h @@ -283,13 +283,13 @@ extern "C" { #ifdef WIN32 /* this was added by the win32 porters Christof.Wegmann@exitgames.com */ rrd_context_t *rrd_force_new_context(void); +#endif - int rrd_proc_start_end( +int rrd_proc_start_end( rrd_time_value_t *, rrd_time_value_t *, time_t *, time_t *); -#endif /* HELPER FUNCTIONS */ void rrd_set_error( -- 2.11.0