summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2022-05-31 02:10:51 -0700
committerKaz Kylheku <kaz@kylheku.com>2022-05-31 02:10:51 -0700
commitcace52fe7bfa4e535dda2f95c4f3d1eda35d3ad2 (patch)
treea78009bba240ff3263aaad26050f03f451445748
parentb35605498a81fef2af4090de92be44a6a0eebc41 (diff)
downloadtxr-cace52fe7bfa4e535dda2f95c4f3d1eda35d3ad2.tar.gz
txr-cace52fe7bfa4e535dda2f95c4f3d1eda35d3ad2.tar.bz2
txr-cace52fe7bfa4e535dda2f95c4f3d1eda35d3ad2.zip
crc32: name clash with Zlib on Android.
* chksum.c (crc32): Stop-gap solution: make it static. Also, fix wrong self-string. * chksum.h (crc32): Declaration removed.
-rw-r--r--chksum.c4
-rw-r--r--chksum.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/chksum.c b/chksum.c
index 462d6bf5..9d697619 100644
--- a/chksum.c
+++ b/chksum.c
@@ -314,9 +314,9 @@ static val crc32_str(val str, val init)
}
-val crc32(val obj, val init)
+static val crc32(val obj, val init)
{
- val self = lit("sha256");
+ val self = lit("crc32");
switch (type(obj)) {
case STR:
diff --git a/chksum.h b/chksum.h
index b6a3154a..7287bc4a 100644
--- a/chksum.h
+++ b/chksum.h
@@ -32,7 +32,6 @@ val sha256_begin(void);
val sha256_hash(val ctx, val obj);
val sha256_end(val ctx, val buf);
val crc32_stream(val stream, val nbytes, val init);
-val crc32(val obj, val init);
val md5_stream(val stream, val nbytes, val buf);
val md5(val obj, val buf_in);
val md5_begin(void);