the following patch (against 7.03.0200) contains two things:

- The first hunk is necessary to build psqlodbc using Borland C++ Builder 6.0 [I successfully built the whole DLL, which requires a few other patches]
- The second hunk is necessary as Borland's sscanf would do all sorts of things with rest[] when CodeGuard is active (I wonder if it's not their way of hinting that we have an opportunity for a buffer overrun here).
Cyrille Ch?p?lov <cyrille@softek.fr>

diff --git a/convert.c b/convert.c
index b8a0e5e7cf083ea006a92928e2b7393a9d3c5dd5..20e0dd6967731ba7ef23b9d78206df956e43bd1b 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -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
 
 /*