projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make setup in travis.yml a bit more verbose
[apt.git]
/
apt-pkg
/
init.h
diff --git
a/apt-pkg/init.h
b/apt-pkg/init.h
index b3e4b147fd45edf4bca662b18e93e09567166482..b6f3df7537b65eb52635b583631c02fcdb5bffce 100644
(file)
--- a/
apt-pkg/init.h
+++ b/
apt-pkg/init.h
@@
-13,8
+13,13
@@
#ifndef PKGLIB_INIT_H
#define PKGLIB_INIT_H
#ifndef PKGLIB_INIT_H
#define PKGLIB_INIT_H
+#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/configuration.h>
#include <apt-pkg/pkgsystem.h>
#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
// These lines are extracted by the makefiles and the buildsystem
// Increasing MAJOR or MINOR results in the need of recompiling all
@@
-22,7
+27,7
@@
// Non-ABI-Breaks should only increase RELEASE number.
// See also buildlib/libversion.mak
#define APT_PKG_MAJOR 4
// Non-ABI-Breaks should only increase RELEASE number.
// See also buildlib/libversion.mak
#define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR
9
+#define APT_PKG_MINOR
12
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
@@
-31,15
+36,4
@@
extern const char *pkgLibVersion;
bool pkgInitConfig(Configuration &Cnf);
bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys);
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
#endif