From 63c73995e982c084a1ec81304a17acdebd7cff1f Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 31 Jul 2009 23:25:35 -0400 Subject: [PATCH] uobject: remove pointless private module.h. --- src/module.c | 24 +++++++++++++++++++++++- src/module.h | 51 --------------------------------------------------- 2 files changed, 23 insertions(+), 52 deletions(-) delete mode 100644 src/module.h diff --git a/src/module.c b/src/module.c index 88a7f81..eec80e7 100644 --- a/src/module.c +++ b/src/module.c @@ -25,9 +25,31 @@ #include #include -#include "module.h" #include "avl.h" +#define UPKG_MODULE_TYPE (upkg_module_get_type()) +#define UPKG_MODULE(obj) \ + G_TYPE_CHECK_INSTANCE_CAST(obj, UPKG_MODULE_TYPE, UPkgModule) +#define UPKG_MODULE_CLASS(class) \ + G_TYPE_CHECK_CLASS_CAST(class, UPKG_MODULE_TYPE, UPkgModuleClass) +#define IS_UPKG_MODULE(obj) \ + G_TYPE_CHECK_INSTANCE_TYPE(obj, UPKG_MODULE_TYPE) +#define IS_UPKG_MODULE_CLASS(class) \ + G_TYPE_CHECK_CLASS_TYPE(class, UPKG_MODULE_TYPE, UPkgModuleClass) + +typedef struct UPkgModule UPkgModule; +typedef struct UPkgModuleClass UPkgModuleClass; + +struct UPkgModule { + GTypeModule parent; + + lt_dlhandle dl; +}; + +struct UPkgModuleClass { + GTypeModuleClass parent; +}; + static unsigned initialized; static struct avl_table *package_tree; diff --git a/src/module.h b/src/module.h deleted file mode 100644 index d28dabb..0000000 --- a/src/module.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * upkg: tool for manipulating Unreal Tournament packages. - * Copyright (C) 2009 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 2 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef MODULE_H_ -#define MODULE_H_ - -#include -#include - -#define UPKG_MODULE_TYPE (upkg_module_get_type()) -#define UPKG_MODULE(obj) \ - G_TYPE_CHECK_INSTANCE_CAST(obj, UPKG_MODULE_TYPE, UPkgModule) -#define UPKG_MODULE_CLASS(class) \ - G_TYPE_CHECK_CLASS_CAST(class, UPKG_MODULE_TYPE, UPkgModuleClass) -#define IS_UPKG_MODULE(obj) \ - G_TYPE_CHECK_INSTANCE_TYPE(obj, UPKG_MODULE_TYPE) -#define IS_UPKG_MODULE_CLASS(class) \ - G_TYPE_CHECK_CLASS_TYPE(class, UPKG_MODULE_TYPE, UPkgModuleClass) - -typedef struct UPkgModule UPkgModule; -typedef struct UPkgModuleClass UPkgModuleClass; - -struct UPkgModule { - GTypeModule parent; - - lt_dlhandle dl; -}; - -struct UPkgModuleClass { - GTypeModuleClass parent; -}; - -static UPkgModule *uobject_module_new(const char *name); - -#endif -- 2.43.2