| 1 |
gienah 12/06/02 06:00:09 |
| 2 |
|
| 3 |
Added: hdbc-odbc-2.3.1.0-ghc-6.12.patch |
| 4 |
Log: |
| 5 |
Bump hdbc-odbc to 2.3.1.0 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.63/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: hdbc-odbc-2.3.1.0-ghc-6.12.patch |
| 16 |
=================================================================== |
| 17 |
--- HDBC-odbc-2.3.1.0-orig/HDBC-odbc.cabal 2011-08-10 07:16:38.000000000 +1000 |
| 18 |
+++ HDBC-odbc-2.3.1.0/HDBC-odbc.cabal 2011-08-12 14:51:43.510895477 +1000 |
| 19 |
@@ -37,10 +37,10 @@ |
| 20 |
ExistentialQuantification, |
| 21 |
ForeignFunctionInterface, |
| 22 |
ScopedTypeVariables |
| 23 |
- Build-Depends: base >= 4.3.1.0 && < 5 |
| 24 |
+ Build-Depends: base >= 4.2.0.2 && < 5 |
| 25 |
, mtl |
| 26 |
, HDBC>=2.1.0 |
| 27 |
- , time>=1.2.0.3 |
| 28 |
+ , time>=1.1.4 |
| 29 |
, utf8-string |
| 30 |
, bytestring |
| 31 |
GHC-Options: -O2 |
| 32 |
--- HDBC-odbc-2.3.1.0-orig/Database/HDBC/ODBC/Statement.hsc 2011-08-10 07:16:38.000000000 +1000 |
| 33 |
+++ HDBC-odbc-2.3.1.0/Database/HDBC/ODBC/Statement.hsc 2011-08-12 15:16:11.585672600 +1000 |
| 34 |
@@ -17,7 +17,7 @@ |
| 35 |
import Database.HDBC.ODBC.Utils |
| 36 |
import Database.HDBC.ODBC.TypeConv |
| 37 |
|
| 38 |
-import Foreign.C.String (castCUCharToChar) |
| 39 |
+import GHC.Base (unsafeChr) |
| 40 |
import Foreign.C.Types |
| 41 |
import Foreign.ForeignPtr |
| 42 |
import Foreign.Ptr |
| 43 |
@@ -55,6 +55,10 @@ |
| 44 |
#let CALLCONV = "ccall" |
| 45 |
#endif |
| 46 |
|
| 47 |
+-- | Convert a C @unsigned char@, representing a Latin-1 character, to |
| 48 |
+-- the corresponding Haskell character. |
| 49 |
+castCUCharToChar :: CUChar -> Char |
| 50 |
+castCUCharToChar ch = unsafeChr (fromIntegral (fromIntegral ch :: Word8)) |
| 51 |
fGetQueryInfo :: Conn -> ChildList -> String |
| 52 |
-> IO ([SqlColDesc], [(String, SqlColDesc)]) |
| 53 |
fGetQueryInfo iconn children query = |
Archives