* apt-pkg/contrib/weakptr.h:

  - include stddefs.h to fix compile error (undefined NULL) with gcc-4.6

diff --git a/apt-pkg/contrib/weakptr.h b/apt-pkg/contrib/weakptr.h
index 5158e393c60c8c2eafb1a949b0c4fd764bc8c376..8de727d89e2aee41db68ecd567d4bbb80e28825c 100644 (file)
--- a/apt-pkg/contrib/weakptr.h
+++ b/apt-pkg/contrib/weakptr.h
@@ -22,6 +22,8 @@
 #define WEAK_POINTER_H
 
 #include <set>
+#include <stddef.h>
+
 /**
  * Class for objects providing support for weak pointers.
  *

diff --git a/debian/changelog b/debian/changelog
index 123b884307adff37af8edeae021fe7493f77c4fe..61b551cc9bc6b0a42b62d56b5767d784a3eea0ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,10 @@ apt (0.8.11+wheezy) unstable; urgency=low
   * apt-pkg/contrib/fileutl.cc:
     - add a RealFileExists method and check that your configuration files
       are real files to avoid endless loops if not (Closes: #604401)
+  * apt-pkg/contrib/weakptr.h:
+    - include stddefs.h to fix compile error (undefined NULL) with gcc-4.6
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 12 Jan 2011 16:53:41 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 12 Jan 2011 17:14:14 +0100
 
 apt (0.8.10) unstable; urgency=low