Merge branch 'master' of github.com:mruby/mruby

cc6e62ef · Yukihiro "Matz" Matsumoto · 580f1e92 · 3d9fecda · cc6e62ef
Commit cc6e62ef authored Mar 31, 2013 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

include/mruby/dump.h include/mruby/dump.h +2 -3

No files found.
--- a/include/mruby/dump.h
+++ b/include/mruby/dump.h
@@ -141,9 +141,8 @@ bin_to_uint8(const uint8_t *bin)
 }

 /* crc.c */
-uint32_t
-calc_crc_16_ccitt(const uint8_t *src, uint32_t nbytes, uint16_t crcwk);
-
+uint16_t
+calc_crc_16_ccitt(const uint8_t *src, size_t nbytes, uint16_t crc);
 #if defined(__cplusplus)
 }  /* extern "C" { */
 #endif