From 6f3a1823b56f47cc17a9d39897965d47d6b2cbb4 Mon Sep 17 00:00:00 2001 From: Phil Ruffwind Date: Mon, 9 Oct 2017 01:25:44 -0400 Subject: [PATCH] Rename windows.h to windows_ext.h Workaround for https://ghc.haskell.org/trac/ghc/ticket/14312 Fixes #77. --- System/Directory/Internal/Windows.hsc | 2 +- System/Directory/Internal/{windows.h => windows_ext.h} | 4 ++++ changelog.md | 7 +++++++ directory.cabal | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) rename System/Directory/Internal/{windows.h => windows_ext.h} (91%) diff --git a/System/Directory/Internal/Windows.hsc b/System/Directory/Internal/Windows.hsc index 4e7fd96f..34acea05 100644 --- a/System/Directory/Internal/Windows.hsc +++ b/System/Directory/Internal/Windows.hsc @@ -12,7 +12,7 @@ module System.Directory.Internal.Windows where #include #include #include -#include +#include import Prelude () import System.Directory.Internal.Prelude import System.Directory.Internal.Common diff --git a/System/Directory/Internal/windows.h b/System/Directory/Internal/windows_ext.h similarity index 91% rename from System/Directory/Internal/windows.h rename to System/Directory/Internal/windows_ext.h index 4f32606a..9c5de016 100644 --- a/System/Directory/Internal/windows.h +++ b/System/Directory/Internal/windows_ext.h @@ -1,3 +1,5 @@ +#ifndef HS_DIRECTORY_WINDOWS_EXT_H +#define HS_DIRECTORY_WINDOWS_EXT_H #include // define prototype to get size, offsets, and alignments @@ -27,3 +29,5 @@ typedef struct { } GenericReparseBuffer; }; } HsDirectory_REPARSE_DATA_BUFFER; + +#endif diff --git a/changelog.md b/changelog.md index 16b070d2..3393322f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,9 +1,15 @@ Changelog for the [`directory`][1] package ========================================== +## 1.3.1.5 (October 2017) + + * Rename the internal header `windows.h` to avoid GHC#14312. + ([#77](https://github.com/haskell/directory/issues/77)) + ## 1.3.1.4 (September 2017) * Fix `Win32` version 2.6 compatibility. + ([#75](https://github.com/haskell/directory/pull/75)) ## 1.3.1.3 (September 2017) @@ -12,6 +18,7 @@ Changelog for the [`directory`][1] package ## 1.3.1.2 (September 2017) * Relax `base` version bounds to support 4.11. + ([#74](https://github.com/haskell/directory/pull/74)) ## 1.3.1.1 (March 2017) diff --git a/directory.cabal b/directory.cabal index a739f405..246a8887 100644 --- a/directory.cabal +++ b/directory.cabal @@ -1,5 +1,5 @@ name: directory -version: 1.3.1.4 +version: 1.3.1.5 -- NOTE: Don't forget to update ./changelog.md license: BSD3 license-file: LICENSE