From 1d42aaf96a0bd741737d755daea2dd623da8e711 Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 26 May 2025 13:18:32 -0400 Subject: [PATCH] follow-up build fix --- include/savefile.h | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/include/savefile.h b/include/savefile.h index f96c041c0..dc569c771 100644 --- a/include/savefile.h +++ b/include/savefile.h @@ -244,12 +244,10 @@ extern void sfi_ulong(NHFILE *, ulong *, const char *); #define Sfo_gamelog_line(a,b,c) sfo_gamelog_line(a, b, c) #define Sfo_fruit(a,b,c) sfo_fruit(a, b, c) #define Sfo_s_level(a,b,c) sfo_s_level(a, b, c) -#define Sfo_schar(a,b,c) sfo_schar(a, b, c); #define Sfo_short(a, b, c) sfo_short(a, b, c) #define Sfo_ushort(a, b, c) sfo_ushort(a, b, c) #define Sfo_int(a, b, c) sfo_int(a, b, c) #define Sfo_unsigned(a, b, c) sfo_unsigned(a, b, c) -#define Sfo_boolean(a,b,c) sfo_boolean(a, b, c); #define Sfo_xint8(a, b, c) sfo_xint8(a, b, c); #define Sfo_xint16(a, b, c) sfo_xint16(a, b, c) /* sfbase.c input functions */ @@ -258,7 +256,6 @@ extern void sfi_ulong(NHFILE *, ulong *, const char *); #define Sfi_any(a,b,c) sfi_any(a, b, c) #define Sfi_genericptr(a,b,c) sfi_genericptr(a, b, c) #define Sfi_coordxy(a,b,c) sfi_int16(a, b, c) -#define Sfi_char(a,b,c,d) sfi_char(a, b, c, d) #define Sfi_int16(a,b,c) sfi_int16(a, b, c) #define Sfi_int32(a,b,c) sfi_int32(a, b, c) #define Sfi_int64(a,b,c) sfi_int64(a, b, c) @@ -312,12 +309,10 @@ extern void sfi_ulong(NHFILE *, ulong *, const char *); #define Sfi_fruit(a,b,c) sfi_fruit(a, b, c) #define Sfi_gamelog_line(a,b,c) sfi_gamelog_line(a, b, c) #define Sfi_s_level(a,b,c) sfi_s_level(a, b, c) -#define Sfi_schar(a,b,c) sfi_schar(a, b, c); #define Sfi_short(a, b, c) sfi_short(a, b, c) #define Sfi_ushort(a, b, c) sfi_ushort(a, b, c) #define Sfi_int(a, b, c) sfi_int(a, b, c); #define Sfi_unsigned(a, b, c) sfi_unsigned(a, b, c); -#define Sfi_boolean(a,b,c) sfi_boolean(a, b, c); #define Sfi_xint8(a, b, c) sfi_xint8(a, b, c); #define Sfi_xint16(a, b, c) sfi_xint16(a, b, c); #else @@ -515,12 +510,6 @@ extern void sfi_ulong(NHFILE *, ulong *, const char *); #define Sfo_xint8(a, b, c) sfo(a, b, c) #define Sfo_xint16(a, b, c) sfo(a, b, c) -/* not in _Generic */ -#define Sfo_long(a,b,c) sfo_long(a, b, c); -#define Sfo_ulong(a,b,c) sfo_ulong(a, b, c); -#define Sfo_char(a,b,c,d) sfo_char(a, b, c, d) -#define Sfo_boolean(a,b,c) sfo_boolean(a, b, c) -#define Sfo_schar(a,b,c) sfo_schar(a, b, c) /* sfbase.c input functions */ #define Sfi_addinfo(a,b,c) sfi(a, b, c) #define Sfi_aligntyp(a,b,c) sfi(a, b, c) @@ -586,14 +575,20 @@ extern void sfi_ulong(NHFILE *, ulong *, const char *); #define Sfi_unsigned(a, b, c) sfi(a, b, c) #define Sfi_xint8(a, b, c) sfi(a, b, c) #define Sfi_xint16(a, b, c) sfi(a, b, c) +#endif /* not in _Generic */ +#define Sfo_long(a,b,c) sfo_long(a, b, c); +#define Sfo_ulong(a,b,c) sfo_ulong(a, b, c); +#define Sfo_char(a,b,c,d) sfo_char(a, b, c, d) +#define Sfo_boolean(a,b,c) sfo_boolean(a, b, c) +#define Sfo_schar(a,b,c) sfo_schar(a, b, c) + #define Sfi_long(a,b,c) sfi_long(a, b, c); #define Sfi_ulong(a,b,c) sfi_ulong(a, b, c); #define Sfi_char(a,b,c,d) sfi_char(a, b, c, d) #define Sfi_boolean(a,b,c) sfi_boolean(a, b, c) #define Sfi_schar(a,b,c) sfi_schar(a, b, c) -#endif #endif /* SAVEFILE_H */