git-annex/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch

57 lines
1.7 KiB
Diff
Raw Normal View History

2014-10-15 18:37:21 +00:00
From db9eb179885874af342bb2c3adef7185496ba1f1 Mon Sep 17 00:00:00 2001
2013-10-18 20:19:22 +00:00
From: dummy <dummy@example.com>
2014-10-15 18:37:21 +00:00
Date: Wed, 15 Oct 2014 16:37:32 +0000
2014-07-14 21:58:13 +00:00
Subject: [PATCH] hack for bionic
2013-09-23 00:14:48 +00:00
---
2014-10-15 18:37:21 +00:00
Data/UnixTime/Types.hsc | 12 ------------
cbits/conv.c | 2 +-
2 files changed, 1 insertion(+), 13 deletions(-)
2013-09-23 00:14:48 +00:00
2013-10-18 20:19:22 +00:00
diff --git a/Data/UnixTime/Types.hsc b/Data/UnixTime/Types.hsc
2014-10-15 18:37:21 +00:00
index d30f39b..ec7ca4c 100644
2013-10-18 20:19:22 +00:00
--- a/Data/UnixTime/Types.hsc
+++ b/Data/UnixTime/Types.hsc
2014-10-15 18:37:21 +00:00
@@ -9,8 +9,6 @@ import Foreign.Storable
2013-10-18 20:19:22 +00:00
#include <sys/time.h>
-#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
-
-- |
-- Data structure for Unix time.
2014-10-15 18:37:21 +00:00
data UnixTime = UnixTime {
@@ -20,16 +18,6 @@ data UnixTime = UnixTime {
2013-10-18 20:19:22 +00:00
, 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)
-
2014-10-15 18:37:21 +00:00
-- |
-- Format of the strptime()/strftime() style.
type Format = ByteString
2013-09-23 00:14:48 +00:00
diff --git a/cbits/conv.c b/cbits/conv.c
2014-10-15 18:37:21 +00:00
index ec31fef..b7bc0f9 100644
2013-09-23 00:14:48 +00:00
--- a/cbits/conv.c
+++ b/cbits/conv.c
2014-10-15 18:37:21 +00:00
@@ -96,7 +96,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) {
2013-09-23 00:14:48 +00:00
#else
strptime(src, fmt, &dst);
#endif
- return timegm(&dst);
+ return NULL; /* timegm(&dst); (not in Bionic) */
}
size_t c_format_unix_time(char *fmt, time_t src, char* dst, int siz) {
--
2014-10-15 18:37:21 +00:00
2.1.1
2013-09-23 00:14:48 +00:00