[commit: packages/Win32] Mistuke-fix-build, depend-os-windows, fix-appveyor-curl-ussue, master, win32-2.5.4.1-ghc-8.2, win32-prepare-release-2.4.0.0: Put windows_cconv.h in install-includes (#55) (7f91a92)

git at git.haskell.org git at git.haskell.org
Mon Apr 17 21:27:43 UTC 2017


Repository : ssh://git@git.haskell.org/Win32

On branches: Mistuke-fix-build,depend-os-windows,fix-appveyor-curl-ussue,master,win32-2.5.4.1-ghc-8.2,win32-prepare-release-2.4.0.0
Link       : http://git.haskell.org/packages/Win32.git/commitdiff/7f91a92f74b7d93081df49d01b408ae1cd9c2ff9

>---------------------------------------------------------------

commit 7f91a92f74b7d93081df49d01b408ae1cd9c2ff9
Author: Ryan Scott <ryan.gl.scott at gmail.com>
Date:   Wed Sep 14 19:50:24 2016 -0400

    Put windows_cconv.h in install-includes (#55)
    
    * Put windows_cconv.h in install-includes
    
    * Changelog note


>---------------------------------------------------------------

7f91a92f74b7d93081df49d01b408ae1cd9c2ff9
 Win32.cabal  | 4 ++--
 changelog.md | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Win32.cabal b/Win32.cabal
index 21f1666..6e8a4c8 100644
--- a/Win32.cabal
+++ b/Win32.cabal
@@ -14,7 +14,7 @@ build-type:     Simple
 cabal-version:  >=1.6
 extra-source-files:
 	include/diatemp.h include/dumpBMP.h include/ellipse.h include/errors.h
-	include/Win32Aux.h include/win32debug.h include/windows_cconv.h
+	include/Win32Aux.h include/win32debug.h
 
 Library
     build-depends:	base >= 4.5 && < 5, bytestring
@@ -66,7 +66,7 @@ Library
         "user32", "gdi32", "winmm", "advapi32", "shell32", "shfolder"
     include-dirs: 	include
     includes:	"HsWin32.h", "HsGDI.h", "WndProc.h"
-    install-includes:	"HsWin32.h", "HsGDI.h", "WndProc.h"
+    install-includes:	"HsWin32.h", "HsGDI.h", "WndProc.h", "windows_cconv.h"
     c-sources:
         cbits/HsGDI.c
         cbits/HsWin32.c
diff --git a/changelog.md b/changelog.md
index f8f6df1..43e5bf4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,10 @@
 
 ## GIT HEAD (Unknown version)
 
+* Add `windows_cconv.h` to the `install-includes` field of `Win32.cabal`,
+  allowing packages that transitively depend on `Win32` to use the
+  `WINDOWS_CCONV` CPP macro (which expands to `stdcall` or `ccall`
+  appropriately depending on the system architecture)
 * Added function `getLongPathName`
 * Added function `getShortPathName`
 * Added function `getUserName`



More information about the ghc-commits mailing list