nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Prevent conflicting types for name "body"

Browse Source
This commit is contained in:
nhkeni
2024-03-01 16:19:30 -05:00
parent d4dabbfa8d
commit ad667216ee
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nhmd4.c
+6 -6
View File
@@ -29,7 +29,7 @@
#include "nhmd4.h" #include "nhmd4.h"
static const unsigned char *body(struct nhmd4_context *, static const unsigned char *nhmd4_body(struct nhmd4_context *,
const unsigned char *, size_t); const unsigned char *, size_t);
/* Avoid a conflict from a Lua header */ /* Avoid a conflict from a Lua header */
@@ -80,7 +80,7 @@ static const unsigned char *body(struct nhmd4_context *,
* the bit counters. There're no alignment requirements. * the bit counters. There're no alignment requirements.
*/ */
static const unsigned char * static const unsigned char *
body( nhmd4_body(
struct nhmd4_context *ctx, struct nhmd4_context *ctx,
const unsigned char *data, const unsigned char *data,
size_t size) size_t size)
@@ -220,11 +220,11 @@ nhmd4_update(
memcpy(&ctx->buffer[used], data, free); memcpy(&ctx->buffer[used], data, free);
data = (const unsigned char *) data + free; data = (const unsigned char *) data + free;
size -= free; size -= free;
body(ctx, ctx->buffer, 64); nhmd4_body(ctx, ctx->buffer, 64);
} }
if (size >= 64) { if (size >= 64) {
data = body(ctx, data, size & ~0x3fUL); data = nhmd4_body(ctx, data, size & ~0x3fUL);
size &= 0x3fUL; size &= 0x3fUL;
} }
@@ -247,7 +247,7 @@ nhmd4_final(
if (free < 8) { if (free < 8) {
memset(&ctx->buffer[used], 0, free); memset(&ctx->buffer[used], 0, free);
body(ctx, ctx->buffer, 64); nhmd4_body(ctx, ctx->buffer, 64);
used = 0; used = 0;
free = 64; free = 64;
} }
@@ -264,7 +264,7 @@ nhmd4_final(
ctx->buffer[62] = ctx->hi >> 16; ctx->buffer[62] = ctx->hi >> 16;
ctx->buffer[63] = ctx->hi >> 24; ctx->buffer[63] = ctx->hi >> 24;
body(ctx, ctx->buffer, 64); nhmd4_body(ctx, ctx->buffer, 64);
result[0] = ctx->a; result[0] = ctx->a;
result[1] = ctx->a >> 8; result[1] = ctx->a >> 8;