aboutsummaryrefslogtreecommitdiff
path: root/src/survive_internal.h
diff options
context:
space:
mode:
authorJoshua Allen <axlecrusher@gmail.com>2017-03-15 19:26:46 -0400
committerJoshua Allen <axlecrusher@gmail.com>2017-03-15 19:26:46 -0400
commit1388d54117ff780b7fadd4fd682b6def569838fa (patch)
tree3737760c889eeaf0bd7305becc943d859ae65d96 /src/survive_internal.h
parent62cef8aec06638bd006eaef46700f491750fc108 (diff)
parent9bd0a0d949639b516d28091f57862ac5e59e65da (diff)
downloadlibsurvive-1388d54117ff780b7fadd4fd682b6def569838fa.tar.gz
libsurvive-1388d54117ff780b7fadd4fd682b6def569838fa.tar.bz2
Merge branch 'master' of github.com:cnlohr/libsurvive
Conflicts: src/survive_data.c
Diffstat (limited to 'src/survive_internal.h')
-rw-r--r--src/survive_internal.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/survive_internal.h b/src/survive_internal.h
index 392104a..e1a733d 100644
--- a/src/survive_internal.h
+++ b/src/survive_internal.h
@@ -7,7 +7,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
-#include <zlib.h>
#include <survive.h>