summaryrefslogtreecommitdiff
path: root/includes/HsFFI.h
diff options
context:
space:
mode:
authorJosh Meredith <joshmeredith2008@gmail.com>2019-12-04 23:39:28 +1100
committerJosh Meredith <joshmeredith2008@gmail.com>2019-12-04 23:39:28 +1100
commita8435165b84c32fd2ebdd1281dd6ee077e07ad5a (patch)
tree791936d014aeaa26174c2dcbef34c14f3329dd04 /includes/HsFFI.h
parent7805441b4d5e22eb63a501e1e40383d10380dc92 (diff)
parentf03a41d4bf9418ee028ecb51654c928b2da74edd (diff)
downloadhaskell-wip/binary-readerT.tar.gz
Merge branch 'master' into wip/binary-readerTwip/binary-readerT
Diffstat (limited to 'includes/HsFFI.h')
-rw-r--r--includes/HsFFI.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/HsFFI.h b/includes/HsFFI.h
index 4b6278b518..32523b2c83 100644
--- a/includes/HsFFI.h
+++ b/includes/HsFFI.h
@@ -3,7 +3,7 @@
* (c) The GHC Team, 2000
*
* A mapping for Haskell types to C types, including the corresponding bounds.
- * Intended to be used in conjuction with the FFI.
+ * Intended to be used in conjunction with the FFI.
*
* WARNING: Keep this file and StgTypes.h in synch!
*