From 45969066e2f26f8b28787560c0b70d1c119982d7 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sun, 27 Feb 2022 14:47:02 -0500 Subject: [PATCH] Avoid C99 stdbool. This is barely used at all, just another pointless library requirement. --- src/uobject/package.c | 4 ++-- src/uobject/package.h | 27 +++++++++++++-------------- src/uobject/uobject.c | 3 +-- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/uobject/package.c b/src/uobject/package.c index 7e42122..30a42cc 100644 --- a/src/uobject/package.c +++ b/src/uobject/package.c @@ -159,9 +159,9 @@ GTypeModule *u_pkg_open(const char *name) return mod; } -bool u_pkg_is_native(GTypeModule *m) +int u_pkg_is_native(GTypeModule *m) { struct upkg_priv *priv = U_PKG_GET_PRIV(m); - return priv->native; + return !!priv->native; } diff --git a/src/uobject/package.h b/src/uobject/package.h index eb217aa..74a0b9d 100644 --- a/src/uobject/package.h +++ b/src/uobject/package.h @@ -1,26 +1,25 @@ /* - * upkg: tool for manipulating Unreal Tournament packages. - * Copyright © 2009-2011 Nick Bowler + * upkg: tool for manipulating Unreal Tournament packages. + * Copyright © 2009-2011, 2022 Nick Bowler * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #ifndef U_OBJECT_PACKAGE_H_ #define U_OBJECT_PACKAGE_H_ #include -#include #define U_PKG_TYPE (u_pkg_get_type()) #define U_PKG(obj) \ @@ -49,6 +48,6 @@ struct UPkgClass { GType u_pkg_get_type(void); GTypeModule *u_pkg_open(const char *name); -bool u_pkg_is_native(GTypeModule *pkg); +int u_pkg_is_native(GTypeModule *pkg); #endif diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c index 0fbcd8d..cf07735 100644 --- a/src/uobject/uobject.c +++ b/src/uobject/uobject.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -43,7 +42,7 @@ struct prop_head { const char *prop_name, *struct_name; unsigned long size, array_idx; - bool tag_msb; + gboolean tag_msb; enum { PROPERTY_END, -- 2.43.2