diff options
| author | Michael Vogt <egon@debian-devbox> | 2012-04-16 19:24:07 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2012-04-16 19:24:07 +0200 |
| commit | 443f5e8a3205162ec6933529c5ca0c95ad3f6941 (patch) | |
| tree | 3e2da22dcecc8eeaabc1ac5ceac0407a8e3cc25f /apt-pkg/init.h | |
| parent | 96273866174c54bdb25813633891f29668d43848 (diff) | |
| parent | f352743312edeebf666e1c8304cdc4baf457469f (diff) | |
merge from the expermental2 branch
Diffstat (limited to 'apt-pkg/init.h')
| -rw-r--r-- | apt-pkg/init.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 15a1165b9..b6f3df753 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -13,8 +13,13 @@ #ifndef PKGLIB_INIT_H #define PKGLIB_INIT_H +#ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/configuration.h> #include <apt-pkg/pkgsystem.h> +#endif + +class pkgSystem; +class Configuration; // These lines are extracted by the makefiles and the buildsystem // Increasing MAJOR or MINOR results in the need of recompiling all @@ -22,8 +27,8 @@ // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 10 -#define APT_PKG_RELEASE 1 +#define APT_PKG_MINOR 12 +#define APT_PKG_RELEASE 0 extern const char *pkgVersion; extern const char *pkgLibVersion; @@ -31,15 +36,4 @@ extern const char *pkgLibVersion; bool pkgInitConfig(Configuration &Cnf); bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys); -#ifdef APT_COMPATIBILITY -#if APT_COMPATIBILITY != 986 -#warning "Using APT_COMPATIBILITY" -#endif - -inline bool pkgInitialize(Configuration &Cnf) -{ - return pkgInitConfig(Cnf) && pkgInitSystem(Cnf,_system); -}; -#endif - #endif |