diff options
author | Christian Federmann <cfedermann@gmail.com> | 2012-05-09 23:45:10 +0400 |
---|---|---|
committer | Christian Federmann <cfedermann@gmail.com> | 2012-05-09 23:45:10 +0400 |
commit | 0e16d637c394e24517d03e37e1f69c7f9de790e5 (patch) | |
tree | 1bc47a02e4bb800e198632fda23e0702234a9186 /util | |
parent | 25f43d13b8f3cc6cc0be19028605efe15eaa416b (diff) |
Fixed merge problem.
Diffstat (limited to 'util')
-rw-r--r-- | util/file_piece.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/util/file_piece.cc b/util/file_piece.cc index 3d4e3fdeb..f1186f94d 100644 --- a/util/file_piece.cc +++ b/util/file_piece.cc @@ -28,7 +28,6 @@ ParseNumberException::ParseNumberException(StringPiece value) throw() { GZException::GZException(gzFile file) { int num; *this << gzerror((gzFile)file, &num) << " from zlib"; -#endif // HAVE_ZLIB } #endif // HAVE_ZLIB |