uobject: remove pointless private module.h.

diff --git a/src/module.c b/src/module.c
index 88a7f81b00137b81a57ed2f7030673e32e7bb03f..eec80e73a5db14ef985a7305b092635ac98b976b 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -25,9 +25,31 @@
 #include <ltdl.h>
 
 #include <uobject/module.h>
-#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 (file)
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 <glib-object.h>
-#include <ltdl.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 UPkgModule *uobject_module_new(const char *name);
-
-#endif