From 71ead7e89e6055b8423fc41eb93c7bc0cc7a626a Mon Sep 17 00:00:00 2001 From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com> Date: Thu, 22 Aug 2024 06:18:00 -0700 Subject: [PATCH 1/3] Fix annoying whitespace macro warning in 1993/leo --- 1993/leo/leo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1993/leo/leo.c b/1993/leo/leo.c index ddc41acc2..0200091ca 100644 --- a/1993/leo/leo.c +++ b/1993/leo/leo.c @@ -6,9 +6,9 @@ #define A(x) (e^d)&i?e:(e+=i+i/15-d,d<<=4,i<<=4,x) #define B b+=!((e^d)&i)&&(d|=i),i<<=4, #define C i=15,B B B B d=d<<4|d>>12, -#define D=(d=g,b=0,C b<<=4, C C C b) +#define D =(d=g,b=0,C b<<=4, C C C b) #define E if(**y)goto -#define F=a[rand()%c] +#define F =a[rand()%c] #define G unsigned short #define H e^=a[z],a[z]^=e,e^=a[z], From 9ce778a8dcd34b6aa7653557fd8487908d89d48a Mon Sep 17 00:00:00 2001 From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com> Date: Thu, 22 Aug 2024 06:25:14 -0700 Subject: [PATCH 2/3] Fix fa807fdb7fd1d1294b5d8e4a570c53a64f431d6d The entry that triggered the funny warning (-Wdocumentation) was not in 2013/birken but 2014/birken. Thus the -Wno-documentation was removed from 2013/birken/Makefile and added to 2014/birken/Makefile. With this commit I believe that every warning that can be disabled has been disabled in some way or another, though this is with an earlier version of clang (clang version 17.0.6 but the most recent one is, according to its website and contrary to wiki claiming 17, 18.1.8, and I also know that fedora linux clang had more problems). --- 2013/birken/Makefile | 2 +- 2014/birken/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/2013/birken/Makefile b/2013/birken/Makefile index deecd83ca..52150e3cd 100644 --- a/2013/birken/Makefile +++ b/2013/birken/Makefile @@ -39,7 +39,7 @@ include ../../var.mk # Common C compiler warnings to silence # CSILENCE= -Wno-newline-eof -Wno-strict-prototypes -Wno-maybe-uninitialized \ - -Wno-misleading-indentation -Wno-documentation + -Wno-misleading-indentation # Attempt to silence unknown warnings # diff --git a/2014/birken/Makefile b/2014/birken/Makefile index 4491a7b0a..5cd1d8c1a 100644 --- a/2014/birken/Makefile +++ b/2014/birken/Makefile @@ -41,7 +41,7 @@ include ../../var.mk CSILENCE= -Wno-comment -Wno-dangling-else -Wno-error \ -Wno-implicit-function-declaration -Wno-incompatible-pointer-types \ -Wno-parentheses -Wno-trigraphs -Wno-newline-eof \ - -Wno-builtin-declaration-mismatch -Wno-sequence-point + -Wno-builtin-declaration-mismatch -Wno-sequence-point -Wno-documentation # Attempt to silence unknown warnings # From b3d865835fd569fe88d8c3c3c7822d2cbfaef242 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Thu, 22 Aug 2024 11:10:23 -0700 Subject: [PATCH 3/3] undo PR #2645 For some reason, PR #2646 was made on top of the code base for pr #2645. If we accept PR #2646 as is, we perform PR #2645 that was previously rejected. This change is an attempt to avoid this. --- 1993/leo/leo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1993/leo/leo.c b/1993/leo/leo.c index 0200091ca..ddc41acc2 100644 --- a/1993/leo/leo.c +++ b/1993/leo/leo.c @@ -6,9 +6,9 @@ #define A(x) (e^d)&i?e:(e+=i+i/15-d,d<<=4,i<<=4,x) #define B b+=!((e^d)&i)&&(d|=i),i<<=4, #define C i=15,B B B B d=d<<4|d>>12, -#define D =(d=g,b=0,C b<<=4, C C C b) +#define D=(d=g,b=0,C b<<=4, C C C b) #define E if(**y)goto -#define F =a[rand()%c] +#define F=a[rand()%c] #define G unsigned short #define H e^=a[z],a[z]^=e,e^=a[z],