Fix the test suite harder

[apt.git] / apt-pkg / init.h

diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index b1ed5922b0bfc1a74bd95642be9e5e0a3a6feb46..d062392e3e199501e65180f9028dc9add7983e3b 100644 (file)
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: init.h,v 1.9.2.2 2004/01/02 18:51:00 mdz Exp $

 /* ######################################################################
 
    Init - Initialize the package library
 /* ######################################################################
 
    Init - Initialize the package library


@@ -13,35 +12,21 @@
 #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
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/macros.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
-// reverse-dependencies of libapt-pkg against the new SONAME.
-// Non-ABI-Breaks should only increase RELEASE number.
-// See also buildlib/libversion.mak
-// FIXME: this needs to be changed to "4" (without quotes) on the next
-//        ABI break
-#define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 8
-#define APT_PKG_RELEASE 0
-    

 extern const char *pkgVersion;
 extern const char *pkgLibVersion;
 
 bool pkgInitConfig(Configuration &Cnf);
 bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys);
 
 extern const char *pkgVersion;
 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
 #endif