From 5f94d621ed3dbd919f521b8dc2750ae88822c360 Mon Sep 17 00:00:00 2001
From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
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@1692 a5681a0c-68f1-0310-ab6d-d61299d08faa
---
 program/src/rrd.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/program/src/rrd.h b/program/src/rrd.h
index 90286d1d..c68421f2 100644
--- a/program/src/rrd.h
+++ b/program/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.30.2