projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Three improvements to Template Haskell (fixes #3467)
[ghc-hetmet.git]
/
compiler
/
parser
/
cutils.c
diff --git
a/compiler/parser/cutils.c
b/compiler/parser/cutils.c
index
4a7b7b3
..
157c902
100644
(file)
--- a/
compiler/parser/cutils.c
+++ b/
compiler/parser/cutils.c
@@
-4,7
+4,9
@@
places in the GHC library.
*/
#include "Rts.h"
*/
#include "Rts.h"
+#if __GLASGOW_HASKELL__ <= 610
#include "RtsFlags.h"
#include "RtsFlags.h"
+#endif
#include "HsFFI.h"
#include "HsFFI.h"
@@
-20,19
+22,19
@@
and causes gcc to require too many registers on x84
*/
HsInt
*/
HsInt
-ghc_strlen( HsAddr a )
+ghc_strlen( HsPtr a )
{
return (strlen((char *)a));
}
HsInt
{
return (strlen((char *)a));
}
HsInt
-ghc_memcmp( HsAddr a1, HsAddr a2, HsInt len )
+ghc_memcmp( HsPtr a1, HsPtr a2, HsInt len )
{
return (memcmp((char *)a1, a2, len));
}
HsInt
{
return (memcmp((char *)a1, a2, len));
}
HsInt
-ghc_memcmp_off( HsAddr a1, HsInt i, HsAddr a2, HsInt len )
+ghc_memcmp_off( HsPtr a1, HsInt i, HsPtr a2, HsInt len )
{
return (memcmp((char *)a1 + i, a2, len));
}
{
return (memcmp((char *)a1 + i, a2, len));
}