This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-server".
The branch, master has been updated
via 78969b8a8bb7ad5240c63a495286587498340d3e (commit)
via 47bb0d2b7cdf5086efb207c7e4036d6dfa0c2fa3 (commit)
from 67dfe16a125db2df4ad1edaa02132b113c5a6fa1 (commit)
Summary of changes:
snap-server.cabal | 3 +++
src/Snap/Internal/Http/Server/Date.hs | 2 +-
test/snap-server-testsuite.cabal | 6 ++++++
3 files changed, 10 insertions(+), 1 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 78969b8a8bb7ad5240c63a495286587498340d3e
Author: Jacob Stanley <[email protected]>
Date: Fri May 28 12:03:57 2010 +0800
Windows: Fixed compile error in POSIXTime -> CTime conversion
diff --git a/src/Snap/Internal/Http/Server/Date.hs
b/src/Snap/Internal/Http/Server/Date.hs
index 17a2abe..2461265 100644
--- a/src/Snap/Internal/Http/Server/Date.hs
+++ b/src/Snap/Internal/Http/Server/Date.hs
@@ -64,7 +64,7 @@ dateState = unsafePerformIO $ do
epochTime :: IO CTime
epochTime = do
t <- getPOSIXTime
- return $ realToFrac t
+ return $ fromInteger $ truncate t
#endif
commit 47bb0d2b7cdf5086efb207c7e4036d6dfa0c2fa3
Author: Jacob Stanley <[email protected]>
Date: Fri May 28 12:03:48 2010 +0800
Windows: Added WIN32 defines when compiling on Windows
diff --git a/snap-server.cabal b/snap-server.cabal
index a7f9d7b..fe17d49 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -130,6 +130,9 @@ Library
if os(darwin)
cpp-options: -DOSX
+ if os(windows)
+ cpp-options: -DWIN32
+
ghc-prof-options: -prof -auto-all
if impl(ghc >= 6.12.0)
diff --git a/test/snap-server-testsuite.cabal b/test/snap-server-testsuite.cabal
index 05cf076..b94928c 100644
--- a/test/snap-server-testsuite.cabal
+++ b/test/snap-server-testsuite.cabal
@@ -55,6 +55,9 @@ Executable testsuite
other-modules: Snap.Internal.Http.Server.SimpleBackend
+ if os(windows)
+ cpp-options: -DWIN32
+
ghc-options: -O2 -Wall -fhpc -fwarn-tabs -funbox-strict-fields -threaded
-fno-warn-unused-do-bind
@@ -111,6 +114,9 @@ Executable pongserver
if os(darwin)
cpp-options: -DOSX
+ if os(windows)
+ cpp-options: -DWIN32
+
ghc-options: -Wall -O2 -fwarn-tabs -funbox-strict-fields -threaded
-fno-warn-unused-do-bind
ghc-prof-options: -prof -auto-all
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
