X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg.h;h=9cb977e143366b1b81b8969bd324f1ef6a8ed8a1;hp=7444faf917bd533a80e4b4acce7e7ddb69c6f35c;hb=5cec98121cd85b63fcd80169a9f51fbf1f9da980;hpb=2fdb3fc0b67757afd6fe7a244b6e14d2a546af0e

diff --git a/libopkg/opkg.h b/libopkg/opkg.h
index 7444faf..9cb977e 100644
--- a/libopkg/opkg.h
+++ b/libopkg/opkg.h
@@ -18,11 +18,14 @@
 #ifndef OPKG_H
 #define OPKG_H
 
-typedef struct _opkg_package_t opkg_package_t;
+#include "pkg.h"
+#include "opkg_message.h"
+
+//typedef struct _opkg_package_t opkg_package_t;
 typedef struct _opkg_progress_data_t opkg_progress_data_t;
 
 typedef void (*opkg_progress_callback_t) (const opkg_progress_data_t *progress, void *user_data);
-typedef void (*opkg_package_callback_t) (opkg_package_t *package, void *user_data);
+typedef void (*opkg_package_callback_t) (pkg_t *pkg, void *user_data);
 
 enum _opkg_action_t
 {
@@ -62,12 +65,9 @@ struct _opkg_progress_data_t
 {
   int percentage;
   int action;
-  opkg_package_t *package;
+  pkg_t *pkg;
 };
 
-opkg_package_t* opkg_package_new ();
-void opkg_package_free (opkg_package_t *package);
-
 int opkg_new (void);
 void opkg_free (void);
 int opkg_re_read_config_files (void);
@@ -82,7 +82,7 @@ int opkg_update_package_lists (opkg_progress_callback_t callback, void *user_dat
 
 int opkg_list_packages (opkg_package_callback_t callback, void *user_data);
 int opkg_list_upgradable_packages (opkg_package_callback_t callback, void *user_data);
-opkg_package_t* opkg_find_package (const char *name, const char *version, const char *architecture, const char *repository);
+pkg_t* opkg_find_package (const char *name, const char *version, const char *architecture, const char *repository);
 
 int opkg_repository_accessibility_check(void);