diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2007-10-23 23:07:09 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2007-10-23 23:07:09 +0000 |
| commit | 0ce67f20c60880d693b20ad418c85f5b5ed8de05 (patch) | |
| tree | 62cc08e8dfdde914a392f480c524e81966747578 /databases/libiodbc/files | |
| parent | 48a2177587feeae18b78cc4547b0a9cd8622fd86 (diff) | |
| download | ports-0ce67f20c60880d693b20ad418c85f5b5ed8de05.tar.gz ports-0ce67f20c60880d693b20ad418c85f5b5ed8de05.zip | |
- Update to 3.52.6
PR: 117333
Submitted by: KATO Tsuguru <tkato432@yahoo.com>
Notes
Notes:
svn path=/head/; revision=201857
Diffstat (limited to 'databases/libiodbc/files')
| -rw-r--r-- | databases/libiodbc/files/patch-include::sqltypes.h | 18 | ||||
| -rw-r--r-- | databases/libiodbc/files/patch-iodbc__trace__trace.c | 22 | ||||
| -rw-r--r-- | databases/libiodbc/files/patch-iodbcinst__unicode.c | 18 |
3 files changed, 9 insertions, 49 deletions
diff --git a/databases/libiodbc/files/patch-include::sqltypes.h b/databases/libiodbc/files/patch-include::sqltypes.h index db55629a9219..3c6c0b2a35b6 100644 --- a/databases/libiodbc/files/patch-include::sqltypes.h +++ b/databases/libiodbc/files/patch-include::sqltypes.h @@ -1,10 +1,10 @@ ---- include/sqltypes.h.orig Thu Jan 26 18:50:59 2006 -+++ include/sqltypes.h Tue Jan 31 13:45:45 2006 -@@ -398,6 +398,7 @@ - defined(_WCHAR_T) || \ +--- include/sqltypes.h.orig Sun Oct 7 22:44:49 2007 ++++ include/sqltypes.h Sat Oct 20 01:06:36 2007 +@@ -399,6 +399,7 @@ defined(_WCHAR_T_DEFINED) || \ - defined(_WCHAR_T_DECLARED) || \ -+ defined(__FreeBSD__) || \ - defined(_BSD_WCHAR_T_DEFINED_) || \ - defined(_BSD_WCHAR_T_) - typedef wchar_t SQLWCHAR; + defined(_WCHAR_T_DEFINED_) || \ + defined(_WCHAR_T_DECLARED) || \ ++ defined(__FreeBSD__) || \ + defined(_BSD_WCHAR_T_DEFINED_) || \ + defined(_BSD_WCHAR_T_) || \ + defined(_BSD_CT_RUNE_T_) diff --git a/databases/libiodbc/files/patch-iodbc__trace__trace.c b/databases/libiodbc/files/patch-iodbc__trace__trace.c deleted file mode 100644 index 54449f40c238..000000000000 --- a/databases/libiodbc/files/patch-iodbc__trace__trace.c +++ /dev/null @@ -1,22 +0,0 @@ ---- iodbc/trace/trace.c.orig Wed Jan 3 23:21:46 2007 -+++ iodbc/trace/trace.c Wed Jan 10 16:04:57 2007 -@@ -670,6 +670,10 @@ - extern char *odbcapi_symtab[]; - char *ptr = "invalid retcode"; - -+#ifdef HAVE_GETTIMEOFDAY -+ struct timeval tv; -+#endif -+ - /* - * Guard against tracefile getting too big - */ -@@ -684,8 +688,6 @@ - * Calculate timestamp - */ - #ifdef HAVE_GETTIMEOFDAY -- struct timeval tv; -- - gettimeofday (&tv, NULL); - tv.tv_sec -= starttime.tv_sec; - tv.tv_usec -= starttime.tv_usec; diff --git a/databases/libiodbc/files/patch-iodbcinst__unicode.c b/databases/libiodbc/files/patch-iodbcinst__unicode.c deleted file mode 100644 index 30234f1cee86..000000000000 --- a/databases/libiodbc/files/patch-iodbcinst__unicode.c +++ /dev/null @@ -1,18 +0,0 @@ ---- iodbcinst/unicode.c.orig Mon Jan 23 19:30:26 2006 -+++ iodbcinst/unicode.c Tue Jan 31 13:51:36 2006 -@@ -197,6 +197,7 @@ - #if !defined(HAVE_TOWLOWER) - #if (defined(__APPLE__) && !defined (_LP64)) || defined (macintosh) - #include <Carbon/Carbon.h> -+#endif - wchar_t towlower(wchar_t wc) - { - #if defined (__APPLE__) && !defined (NO_FRAMEWORKS) -@@ -218,7 +219,6 @@ - return wc; - #endif - } --#endif - #endif - - #if !defined(HAVE_WCSNCASECMP) |