diff options
| author | Simon Barner <barner@FreeBSD.org> | 2006-01-31 21:28:38 +0000 |
|---|---|---|
| committer | Simon Barner <barner@FreeBSD.org> | 2006-01-31 21:28:38 +0000 |
| commit | 3cd345f14fbd25b2fac040f92b8e517e91b35edd (patch) | |
| tree | 763c6869a20a1fb80e27edd5395c6458760cca41 /databases/libiodbc/files | |
| parent | c81e0aecca1aee03ad022396542d435fa90a52a4 (diff) | |
| download | ports-3cd345f14fbd25b2fac040f92b8e517e91b35edd.tar.gz ports-3cd345f14fbd25b2fac040f92b8e517e91b35edd.zip | |
- Update to version 3.52.4 [1]
- Use less greedy CONFLICTS
Submitted by: Ports fury
PR: ports/92612
Notes
Notes:
svn path=/head/; revision=154931
Diffstat (limited to 'databases/libiodbc/files')
| -rw-r--r-- | databases/libiodbc/files/patch-include::sqltypes.h | 12 | ||||
| -rw-r--r-- | databases/libiodbc/files/patch-iodbcinst__unicode.c (renamed from databases/libiodbc/files/patch-iodbc__unicode.c) | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/databases/libiodbc/files/patch-include::sqltypes.h b/databases/libiodbc/files/patch-include::sqltypes.h index c521292aadd9..db55629a9219 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 Wed Sep 29 19:14:06 2004 -+++ include/sqltypes.h Sat Nov 13 15:26:42 2004 -@@ -387,6 +387,7 @@ - # if defined(_WCHAR_T) || \ +--- 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) || \ defined(_WCHAR_T_DEFINED) || \ defined(_WCHAR_T_DECLARED) || \ + defined(__FreeBSD__) || \ - defined(_BSD_WCHAR_T_DEFINED_) + defined(_BSD_WCHAR_T_DEFINED_) || \ + defined(_BSD_WCHAR_T_) typedef wchar_t SQLWCHAR; - # else diff --git a/databases/libiodbc/files/patch-iodbc__unicode.c b/databases/libiodbc/files/patch-iodbcinst__unicode.c index 58c4b2ec9951..30234f1cee86 100644 --- a/databases/libiodbc/files/patch-iodbc__unicode.c +++ b/databases/libiodbc/files/patch-iodbcinst__unicode.c @@ -1,14 +1,14 @@ ---- iodbc/unicode.c.orig Tue Aug 30 22:24:12 2005 -+++ iodbc/unicode.c Thu Nov 10 13:35:19 2005 -@@ -192,6 +192,7 @@ +--- 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) { - #ifdef __APPLE__ -@@ -213,7 +214,6 @@ + #if defined (__APPLE__) && !defined (NO_FRAMEWORKS) +@@ -218,7 +219,6 @@ return wc; #endif } |