diff --git a/third_party/cgit/filter.c b/third_party/cgit/filter.c
index 70f5b7499..181d9a892 100644
--- a/third_party/cgit/filter.c
+++ b/third_party/cgit/filter.c
@@ -385,7 +385,7 @@ int cgit_close_filter(struct cgit_filter *filter)
 
 void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char *prefix)
 {
-	filter->fprintf(filter, f, prefix);
+	(filter->fprintf)(filter, f, prefix);
 }
 
 
diff --git a/third_party/cgit/parsing.c b/third_party/cgit/parsing.c
index 7b3980e6b..b4b5f904d 100644
--- a/third_party/cgit/parsing.c
+++ b/third_party/cgit/parsing.c
@@ -72,7 +72,7 @@ static void parse_user(const char *t, char **name, char **email, unsigned long *
 	struct ident_split ident;
 	unsigned email_len;
 
-	if (!split_ident_line(&ident, t, strchrnul(t, '\n') - t)) {
+	if (!split_ident_line(&ident, t, (uintptr_t)strchrnul(t, '\n') - (uintptr_t)t)) {
 		*name = substr(ident.name_begin, ident.name_end);
 
 		email_len = ident.mail_end - ident.mail_begin;