diff options
| author | Joshua Allen <axlecrusher@gmail.com> | 2017-03-15 19:26:46 -0400 |
|---|---|---|
| committer | Joshua Allen <axlecrusher@gmail.com> | 2017-03-15 19:26:46 -0400 |
| commit | 1388d54117ff780b7fadd4fd682b6def569838fa (patch) | |
| tree | 3737760c889eeaf0bd7305becc943d859ae65d96 /src/ootx_decoder.c | |
| parent | 62cef8aec06638bd006eaef46700f491750fc108 (diff) | |
| parent | 9bd0a0d949639b516d28091f57862ac5e59e65da (diff) | |
| download | libsurvive-1388d54117ff780b7fadd4fd682b6def569838fa.tar.gz libsurvive-1388d54117ff780b7fadd4fd682b6def569838fa.tar.bz2 | |
Merge branch 'master' of github.com:cnlohr/libsurvive
Conflicts:
src/survive_data.c
Diffstat (limited to 'src/ootx_decoder.c')
| -rw-r--r-- | src/ootx_decoder.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ootx_decoder.c b/src/ootx_decoder.c index e35c24d..f7a7938 100644 --- a/src/ootx_decoder.c +++ b/src/ootx_decoder.c @@ -6,10 +6,14 @@ #include <stdio.h> #include <stdlib.h> -#include <zlib.h> #include <assert.h> #include "ootx_decoder.h" -//#include "crc32.h" + +#ifdef NOZLIB +#include "crc32.h" +#else +#include <zlib.h> +#endif //char* fmt_str = "L Y HMD %d 5 1 206230 %d\n"; @@ -145,7 +149,7 @@ void ootx_pump_bit(ootx_decoder_context *ctx, uint8_t dbit) { op.data = ctx->buffer+2; op.crc32 = *(uint32_t*)(op.data+padded_length); - uint32_t crc = crc32( 0L, Z_NULL, 0 ); + uint32_t crc = crc32( 0L, 0 /*Z_NULL*/, 0 ); crc = crc32( crc, op.data,op.length); if (crc != op.crc32) { |