update some patches for new versions
This commit is contained in:
parent
d915328b36
commit
eeb4182cb2
2 changed files with 48 additions and 17 deletions
|
@ -1,12 +1,43 @@
|
|||
From eff7034f0c9f80fd30c9d8952b3fd0a343adccc8 Mon Sep 17 00:00:00 2001
|
||||
From: foo <bar>
|
||||
Date: Mon, 23 Sep 2013 00:12:35 +0000
|
||||
Subject: [PATCH] hack for Bionic
|
||||
From e6d5c141186dbdbe97c698294485ffc4dcd3a843 Mon Sep 17 00:00:00 2001
|
||||
From: dummy <dummy@example.com>
|
||||
Date: Fri, 18 Oct 2013 16:45:50 +0000
|
||||
Subject: [PATCH] hack for bionic + cross build
|
||||
|
||||
---
|
||||
cbits/conv.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
Data/UnixTime/Types.hsc | 12 ------------
|
||||
cbits/conv.c | 2 +-
|
||||
2 files changed, 1 insertion(+), 13 deletions(-)
|
||||
|
||||
diff --git a/Data/UnixTime/Types.hsc b/Data/UnixTime/Types.hsc
|
||||
index d30f39b..ec7ca4c 100644
|
||||
--- a/Data/UnixTime/Types.hsc
|
||||
+++ b/Data/UnixTime/Types.hsc
|
||||
@@ -9,8 +9,6 @@ import Foreign.Storable
|
||||
|
||||
#include <sys/time.h>
|
||||
|
||||
-#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
|
||||
-
|
||||
-- |
|
||||
-- Data structure for Unix time.
|
||||
data UnixTime = UnixTime {
|
||||
@@ -20,16 +18,6 @@ data UnixTime = UnixTime {
|
||||
, utMicroSeconds :: {-# UNPACK #-} !Int32
|
||||
} deriving (Eq,Ord,Show)
|
||||
|
||||
-instance Storable UnixTime where
|
||||
- sizeOf _ = (#size struct timeval)
|
||||
- alignment _ = (#alignment struct timeval)
|
||||
- peek ptr = UnixTime
|
||||
- <$> (#peek struct timeval, tv_sec) ptr
|
||||
- <*> (#peek struct timeval, tv_usec) ptr
|
||||
- poke ptr ut = do
|
||||
- (#poke struct timeval, tv_sec) ptr (utSeconds ut)
|
||||
- (#poke struct timeval, tv_usec) ptr (utMicroSeconds ut)
|
||||
-
|
||||
-- |
|
||||
-- Format of the strptime()/strftime() style.
|
||||
type Format = ByteString
|
||||
diff --git a/cbits/conv.c b/cbits/conv.c
|
||||
index 7ff7b87..2e4c870 100644
|
||||
--- a/cbits/conv.c
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue