[commit: packages/bytestring] master, revert-46-patch-1, wip/nix-local-build: Merge pull request #63 from hvr/pr-de-cpp (dd3c07d)

[git at git.haskell.org]

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

On branches: master,revert-46-patch-1,wip/nix-local-build
Link       : http://git.haskell.org/packages/bytestring.git/commitdiff/dd3c07d115840d13482426a0084a39201eb6b6d4

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

commit dd3c07d115840d13482426a0084a39201eb6b6d4
Merge: 9900f65 9306e29
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Tue Oct 20 12:18:32 2015 +0100

    Merge pull request #63 from hvr/pr-de-cpp
    
    Radically reduce #ifdefs



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

dd3c07d115840d13482426a0084a39201eb6b6d4
 Data/ByteString.hs                                 | 152 +--------------------
 Data/ByteString/Builder/ASCII.hs                   |   4 +-
 Data/ByteString/Builder/Internal.hs                |  10 +-
 .../Builder/Prim/Internal/UncheckedShifts.hs       |  13 +-
 Data/ByteString/Char8.hs                           |  10 --
 Data/ByteString/Internal.hs                        |  95 +------------
 Data/ByteString/Lazy.hs                            |  12 --
 Data/ByteString/Lazy/Char8.hs                      |   5 -
 Data/ByteString/Lazy/Internal.hs                   |  24 +---
 Data/ByteString/Short/Internal.hs                  |   4 -
 Data/ByteString/Unsafe.hs                          |  22 ---
 tests/builder/Data/ByteString/Builder/Tests.hs     |   6 -
 12 files changed, 17 insertions(+), 340 deletions(-)