diff options
author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-07-27 11:05:30 +0100 |
---|---|---|
committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-07-27 11:05:30 +0100 |
commit | 64a27638cd3260e0487dd43147d55436735763e7 (patch) | |
tree | 214c0974205faa88fba7e850c062117e80b5ae6c /compiler/utils/md5.c | |
parent | 3fdd294af643a86162e544f442b0e36c57e1db36 (diff) | |
parent | 7639e7518b8430b3f2eff2b847c3283e0f00e8ec (diff) | |
download | haskell-64a27638cd3260e0487dd43147d55436735763e7.tar.gz |
Merge branch 'master' of http://darcs.haskell.org/ghc
Conflicts:
compiler/coreSyn/CoreSubst.lhs
compiler/rename/RnNames.lhs
Diffstat (limited to 'compiler/utils/md5.c')
-rw-r--r-- | compiler/utils/md5.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/utils/md5.c b/compiler/utils/md5.c index 0570cbbdf1..06c2d37738 100644 --- a/compiler/utils/md5.c +++ b/compiler/utils/md5.c @@ -15,6 +15,8 @@ * will fill a supplied 16-byte array with the digest. */ +#if __GLASGOW_HASKELL__ < 701 + #include "HsFFI.h" #include "md5.h" #include <string.h> @@ -236,3 +238,4 @@ MD5Transform(word32 buf[4], word32 const in[16]) buf[3] += d; } +#endif |