From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/compat/obstack.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'third_party/git/compat/obstack.h') diff --git a/third_party/git/compat/obstack.h b/third_party/git/compat/obstack.h index f90a46d9b9..ae36ed6a66 100644 --- a/third_party/git/compat/obstack.h +++ b/third_party/git/compat/obstack.h @@ -79,7 +79,7 @@ change its address during its lifetime. When the chars burst over a chunk boundary, we allocate a larger chunk, and then copy the partly formed object from the end of the old chunk to the beginning of the new larger chunk. We then carry on -accrediting characters to the end of the object as we normally would. +accreting characters to the end of the object as we normally would. A special macro is provided to add a single char at a time to a growing object. This allows the use of register variables, which @@ -135,10 +135,8 @@ extern "C" { alignment relative to 0. */ #define __PTR_ALIGN(B, P, A) \ - (sizeof (PTR_INT_TYPE) < sizeof(void *) ? \ - __BPTR_ALIGN((B), (P), (A)) : \ - (void *)__BPTR_ALIGN((PTR_INT_TYPE)(void *)0, (PTR_INT_TYPE)(P), (A)) \ - ) + __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \ + P, A) #include -- cgit 1.4.1