author | drw <drw> | 2005-04-01 20:32:01 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-01 20:32:01 (UTC) |
commit | cc4594a5c8d45d2f8d14c6ac1723a8ed39577f8f (patch) (unidiff) | |
tree | 3500347a14f4106be68712c4d4af49e3c69f7248 | |
parent | 629c1c9a366f56e9d98940f8dcd0778d039f1421 (diff) | |
download | opie-cc4594a5c8d45d2f8d14c6ac1723a8ed39577f8f.zip opie-cc4594a5c8d45d2f8d14c6ac1723a8ed39577f8f.tar.gz opie-cc4594a5c8d45d2f8d14c6ac1723a8ed39577f8f.tar.bz2 |
Fix linking issue with libipkg >= 0.99.146, at least until I can come up with a better way to do it...
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 5 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkg.h | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index 127204d..7bc2040 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp | |||
@@ -40,2 +40,7 @@ _;:, .> :=|. This program is free software; you can | |||
40 | 40 | ||
41 | extern "C" { | ||
42 | #include <libipkg.h> | ||
43 | }; | ||
44 | args_t m_ipkgArgs; // libipkg configuration arguments | ||
45 | |||
41 | const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file | 46 | const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file |
diff --git a/noncore/settings/packagemanager/oipkg.h b/noncore/settings/packagemanager/oipkg.h index 0263f50..4e390fa 100644 --- a/noncore/settings/packagemanager/oipkg.h +++ b/noncore/settings/packagemanager/oipkg.h | |||
@@ -41,6 +41,2 @@ _;:, .> :=|. This program is free software; you can | |||
41 | 41 | ||
42 | extern "C" { | ||
43 | #include <libipkg.h> | ||
44 | }; | ||
45 | |||
46 | // Ipkg execution options (m_ipkgExecOptions) | 42 | // Ipkg execution options (m_ipkgExecOptions) |
@@ -81,3 +77,3 @@ public: | |||
81 | const QString &name = QString::null ); | 77 | const QString &name = QString::null ); |
82 | 78 | ||
83 | bool executeCommand( OPackage::Command command = OPackage::NotDefined, | 79 | bool executeCommand( OPackage::Command command = OPackage::NotDefined, |
@@ -96,3 +92,2 @@ private: | |||
96 | Config *m_config; // Pointer to application configuration file | 92 | Config *m_config; // Pointer to application configuration file |
97 | args_t m_ipkgArgs; // libipkg configuration arguments | ||
98 | OConfItemList *m_confInfo; // Contains info from all Ipkg configuration files | 93 | OConfItemList *m_confInfo; // Contains info from all Ipkg configuration files |