Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Remove the last traces of Typeable.h #113

Merged
merged 1 commit into from

2 participants

@rwbarton

Reverts 7774c93, as we no longer include a Typeable.h, and removes
some leftover references to base's Typeable.h (which we no longer use,
and will disappear in GHC 7.10).

@rwbarton rwbarton Remove the last traces of Typeable.h
Reverts 7774c93, as we no longer include a Typeable.h, and removes
some leftover references to base's Typeable.h (which we no longer use,
and will disappear in GHC 7.10).
fb944a3
@tibbe tibbe merged commit fb944a3 into haskell:master
@rwbarton rwbarton deleted the rwbarton:cleanup branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 10, 2013
  1. @rwbarton

    Remove the last traces of Typeable.h

    rwbarton authored
    Reverts 7774c93, as we no longer include a Typeable.h, and removes
    some leftover references to base's Typeable.h (which we no longer use,
    and will disappear in GHC 7.10).
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 12 deletions.
  1. +0 −3  Network/BSD.hsc
  2. +0 −3  Network/Socket.hsc
  3. +1 −6 include/Makefile
View
3  Network/BSD.hsc
@@ -16,9 +16,6 @@
#include "HsNet.h"
--- NOTE: ##, we want this interpreted when compiling the .hs, not by hsc2hs.
-##include "Typeable.h"
-
module Network.BSD
(
-- * Host names
View
3  Network/Socket.hsc
@@ -22,9 +22,6 @@
#include "HsNet.h"
--- NOTE: ##, we want this interpreted when compiling the .hs, not by hsc2hs.
-##include "Typeable.h"
-
-- In order to process this file, you need to have CALLCONV defined.
module Network.Socket
View
7 include/Makefile
@@ -7,12 +7,7 @@ include $(TOP)/mk/boilerplate.mk
H_FILES = $(wildcard *.h)
includedir = $(libdir)/include
-
-# Typeable.h doesn't need to be installed, and in fact it'll clobber the
-# Typeable.h from package base (which arguably doesn't need to be installed
-# either, but apparently some people use it...). See bug #1106. The Cabal
-# description for network already does the right thing here.
-INSTALL_INCLUDES = $(filter-out Typeable.h,$(H_FILES))
+INSTALL_INCLUDES = $(H_FILES)
DIST_CLEAN_FILES += HsNetworkConfig.h
Something went wrong with that request. Please try again.