refresh haskell patches
This commit is contained in:
parent
e86807ea0b
commit
4aa9265042
2 changed files with 31 additions and 18 deletions
|
@ -1,18 +1,19 @@
|
|||
From 5433c4f62b1818e09682a64dee229142f88f17d9 Mon Sep 17 00:00:00 2001
|
||||
From add5feeb9ee9b4ffa1b43e4ba04b63e5ac2bfaf7 Mon Sep 17 00:00:00 2001
|
||||
From: dummy <dummy@example.com>
|
||||
Date: Thu, 3 Jul 2014 20:48:02 +0000
|
||||
Subject: [PATCH] ihack for bionic and cross build
|
||||
Date: Mon, 14 Jul 2014 20:45:24 +0000
|
||||
Subject: [PATCH] hack for bionic
|
||||
|
||||
---
|
||||
Data/UnixTime/Types.hsc | 12 ------------
|
||||
cbits/conv.c | 2 +-
|
||||
2 files changed, 1 insertion(+), 13 deletions(-)
|
||||
unix-time.cabal | 1 -
|
||||
3 files changed, 1 insertion(+), 14 deletions(-)
|
||||
|
||||
diff --git a/Data/UnixTime/Types.hsc b/Data/UnixTime/Types.hsc
|
||||
index 403daa6..4e66880 100644
|
||||
index 2ad0623..04fd766 100644
|
||||
--- a/Data/UnixTime/Types.hsc
|
||||
+++ b/Data/UnixTime/Types.hsc
|
||||
@@ -10,8 +10,6 @@ import Data.Binary
|
||||
@@ -12,8 +12,6 @@ import Data.Binary
|
||||
|
||||
#include <sys/time.h>
|
||||
|
||||
|
@ -21,7 +22,7 @@ index 403daa6..4e66880 100644
|
|||
-- |
|
||||
-- Data structure for Unix time.
|
||||
data UnixTime = UnixTime {
|
||||
@@ -21,16 +19,6 @@ data UnixTime = UnixTime {
|
||||
@@ -23,16 +21,6 @@ data UnixTime = UnixTime {
|
||||
, utMicroSeconds :: {-# UNPACK #-} !Int32
|
||||
} deriving (Eq,Ord,Show)
|
||||
|
||||
|
@ -35,9 +36,9 @@ index 403daa6..4e66880 100644
|
|||
- (#poke struct timeval, tv_sec) ptr (utSeconds ut)
|
||||
- (#poke struct timeval, tv_usec) ptr (utMicroSeconds ut)
|
||||
-
|
||||
#if __GLASGOW_HASKELL__ >= 704
|
||||
instance Binary UnixTime where
|
||||
put (UnixTime (CTime sec) msec) = do
|
||||
put sec
|
||||
diff --git a/cbits/conv.c b/cbits/conv.c
|
||||
index ec31fef..b7bc0f9 100644
|
||||
--- a/cbits/conv.c
|
||||
|
@ -51,6 +52,18 @@ index ec31fef..b7bc0f9 100644
|
|||
}
|
||||
|
||||
size_t c_format_unix_time(char *fmt, time_t src, char* dst, int siz) {
|
||||
diff --git a/unix-time.cabal b/unix-time.cabal
|
||||
index 5de3f7c..7a0c244 100644
|
||||
--- a/unix-time.cabal
|
||||
+++ b/unix-time.cabal
|
||||
@@ -15,7 +15,6 @@ Extra-Tmp-Files: config.log config.status autom4te.cache cbits/config.h
|
||||
Library
|
||||
Default-Language: Haskell2010
|
||||
GHC-Options: -Wall
|
||||
- CC-Options: -fPIC
|
||||
Exposed-Modules: Data.UnixTime
|
||||
Other-Modules: Data.UnixTime.Conv
|
||||
Data.UnixTime.Diff
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue