diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:04:05 -0700 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:27:52 -0700 |
commit | 4a893f72cadaa875a920db8949171b002f656e43 (patch) | |
tree | 1e08a3cb6f579cab9c3c9a138d36ababdf76121b /includes/ZHandle.h | |
parent | 56d91ddd2cd42b782cde0bb3fdf4eb9ebe7597be (diff) | |
parent | 06674e57649d536cf19715524ee40c5ad4a9026d (diff) |
Merge commit '06674e57649d536cf19715524ee40c5ad4a9026d'
Conflicts:
includes/LuaTask.h
includes/TaskMan.h
includes/Threads.h
src/TaskMan.cc
src/Threads.cc
Diffstat (limited to 'includes/ZHandle.h')
-rw-r--r-- | includes/ZHandle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/ZHandle.h b/includes/ZHandle.h index 048e0cb..e972466 100644 --- a/includes/ZHandle.h +++ b/includes/ZHandle.h @@ -28,9 +28,9 @@ class ZStream : public Handle { void doFlush(bool finish); IO<Handle> m_h; z_stream m_zin, m_zout; - bool m_detached, m_closed, m_eof; + bool m_detached = false, m_closed = false, m_eof = false; String m_name; - uint8_t * m_in; + uint8_t * m_in = NULL; }; }; |