--- psqlodbc-07.03.0200.vanilla/convert.c	2003-10-20 04:37:42.000000000 +0200
+++ psqlodbc-07.03.0200/convert.c	2003-12-17 10:24:12.000000000 +0100
@@ -44,9 +44,15 @@
 #endif
 
 #ifdef	__CYGWIN__
-#define TIMEZONE_GLOBAL _timezone
+#  define TIMEZONE_GLOBAL _timezone
 #elif	defined(WIN32) || defined(HAVE_INT_TIMEZONE)
-#define TIMEZONE_GLOBAL timezone
+#  ifdef __BORLANDC__
+#    define timezone _timzone
+#    define daylight _daylight
+#    define TIMEZONE_GLOBAL _timezone
+#  else
+#    define TIMEZONE_GLOBAL timezone
+#  endif
 #endif
 
 /*
@@ -195,6 +201,7 @@
 	*zone = 0;
 	st->fr = 0;
 	st->infinity = 0;
+        rest[0] = 0;
 	if ((scnt = sscanf(str, "%4d-%2d-%2d %2d:%2d:%2d%s", &st->y, &st->m, &st->d, &st->hh, &st->mm, &st->ss, rest)) < 6)
 		return FALSE;
 	else if (scnt == 6)