[commit: packages/directory] cbits: Remove deprecated C bits (3f54c1f)

[git at git.haskell.org]

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

On branch  : cbits
Link       : http://ghc.haskell.org/trac/ghc/changeset/3f54c1f54484c5e5cbc481b3c2e73ae7f47b3d91/directory

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

commit 3f54c1f54484c5e5cbc481b3c2e73ae7f47b3d91
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Wed Apr 27 00:09:45 2016 -0400

    Remove deprecated C bits
    
    See also: 7d36863a833c6a69f76d727460f9e8695f2b4dd3
    
    Fixes #50.


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

3f54c1f54484c5e5cbc481b3c2e73ae7f47b3d91
 cbits/directory.c     |  9 -------
 changelog.md          |  6 +++++
 directory.cabal       | 10 ++------
 include/HsDirectory.h | 70 ---------------------------------------------------
 4 files changed, 8 insertions(+), 87 deletions(-)

diff --git a/cbits/directory.c b/cbits/directory.c
deleted file mode 100644
index 7f853f1..0000000
--- a/cbits/directory.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * (c) The University of Glasgow 2002
- *
- */
-
-/* [DEPRECATED] This file may be removed in future versions. */
-
-#define INLINE
-#include "HsDirectory.h"
diff --git a/changelog.md b/changelog.md
index 273413d..48fd651 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,12 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
+## 1.2.7.0 (May 2015)
+
+  * Remove deprecated C bits.  This means `HsDirectory.h` and its functions
+    are no longer available.
+    ([#50](https://github.com/haskell/directory/issues/50))
+
 ## 1.2.6.3 (May 2015)
 
   * Add missing import of `(<*>)` on Windows for `base` earlier than 4.8.0.0
diff --git a/directory.cabal b/directory.cabal
index 18f0094..f9a79bf 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -1,5 +1,5 @@
 name:           directory
-version:        1.2.6.3
+version:        1.2.7.0
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE
@@ -49,13 +49,7 @@ Library
         System.Directory.Internal.Posix
         System.Directory.Internal.Windows
 
-    c-sources:
-        cbits/directory.c
-    include-dirs: . include
-    includes:
-        HsDirectory.h
-    install-includes:
-        HsDirectory.h
+    include-dirs: .
 
     build-depends:
         base     >= 4.5 && < 4.10,
diff --git a/include/HsDirectory.h b/include/HsDirectory.h
deleted file mode 100644
index 46b7c51..0000000
--- a/include/HsDirectory.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -----------------------------------------------------------------------------
- *
- * (c) The University of Glasgow 2001-2004
- *
- * Definitions for package `directory' which are visible in Haskell land.
- *
- * ---------------------------------------------------------------------------*/
-
-/* [DEPRECATED] Do not include this header nor HsDirectoryConfig.h.  They are
-   for internal use only and may be removed in future versions. */
-
-#ifndef __HSDIRECTORY_H__
-#define __HSDIRECTORY_H__
-
-// On Solaris we have to make sure _FILE_OFFSET_BITS is defined 
-// before including <sys/stat.h> below, because that header
-// will try and define it if it isn't already.
-#include "HsFFI.h"
-
-#include "HsDirectoryConfig.h"
-
-// Otherwise these clash with similar definitions from other packages:
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#include "HsFFI.h"
-
-/* -----------------------------------------------------------------------------
-   INLINE functions.
-
-   These functions are given as inlines here for when compiling via C,
-   but we also generate static versions into the cbits library for
-   when compiling to native code.
-   -------------------------------------------------------------------------- */
-
-#ifndef INLINE
-# if defined(_MSC_VER)
-#  define INLINE extern __inline
-# else
-#  define INLINE static inline
-# endif
-#endif
-
-/* Do not use: it may give the wrong value on systems where PATH_MAX is not
-   defined (e.g. Hurd).  Instead, use System.Directory.Internal.c_PATH_MAX. */
-INLINE HsInt __hscore_long_path_size(void) {
-#ifdef PATH_MAX
-    return PATH_MAX;
-#else
-    return 4096;
-#endif
-}
-
-INLINE mode_t __hscore_S_IRUSR(void) { return S_IRUSR; }
-INLINE mode_t __hscore_S_IWUSR(void) { return S_IWUSR; }
-INLINE mode_t __hscore_S_IXUSR(void) { return S_IXUSR; }
-INLINE mode_t __hscore_S_IFDIR(void) { return S_IFDIR; }
-
-#endif /* __HSDIRECTORY_H__ */