merge r1966..1967 from lp:~donkult/apt/sid

11 files changed, 16 insertions, 19 deletions

diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 8338fd89d..3d2788aaf 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -21,7 +21,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
-#include <system.h>
+#include <apt-pkg/macros.h>
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index b43771ea7..985d89d90 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -14,9 +14,9 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
-    
+#include <apt-pkg/macros.h>
+
 #include <unistd.h>    
-#include <system.h>    
 #include <string>
 #include <iostream>
 									/*}}}*/
diff --git a/apt-pkg/contrib/system.h b/apt-pkg/contrib/macros.h
index a0580b218..9aeb77b81 100644
--- a/apt-pkg/contrib/system.h
+++ b/apt-pkg/contrib/macros.h
@@ -1,9 +1,8 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: system.h,v 1.3 1999/12/10 23:40:29 jgg Exp $
 /* ######################################################################
    
-   System Header - Usefull private definitions
+   Macros Header - Various useful macro definitions
 
    This source is placed in the Public Domain, do with it what you will
    It was originally written by Brian C. White.
@@ -11,8 +10,8 @@
    ##################################################################### */
 									/*}}}*/
 // Private header
-#ifndef SYSTEM_H
-#define SYSTEM_H
+#ifndef MACROS_H
+#define MACROS_H
 
 // MIN_VAL(SINT16) will return -0x8000 and MAX_VAL(SINT16) = 0x7FFF
 #define	MIN_VAL(t)	(((t)(-1) > 0) ? (t)( 0) : (t)(((1L<<(sizeof(t)*8-1))  )))
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 2bfd70f1b..c0fa8493d 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -37,14 +37,13 @@
 // Include Files							/*{{{*/
 #include <apt-pkg/md5.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/macros.h>
 
 #include <string.h>
 #include <unistd.h>
 #include <netinet/in.h>                          // For htonl
 #include <inttypes.h>
 #include <config.h>
-#include <system.h>
-
 									/*}}}*/
 
 // byteSwap - Swap bytes in a buffer					/*{{{*/
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index b70f31dc6..eae52d52f 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -31,12 +31,12 @@
 // Include Files                                                        /*{{{*/
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/macros.h>
 
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <config.h>
-#include <system.h>
 									/*}}}*/
 
 // SHA1Transform - Alters an existing SHA-1 hash			/*{{{*/
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 517b771a5..25b0953e0 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -16,10 +16,9 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/crc-16.h>
 #include <apt-pkg/md5.h>
+#include <apt-pkg/macros.h>
 
 #include <ctype.h>
-
-#include <system.h>
 									/*}}}*/
 
 static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Important},
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 3d6209658..bdd49c089 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -24,7 +24,8 @@ SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
 	 contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \
 	 contrib/fileutl.cc 
 HEADERS = mmap.h error.h configuration.h fileutl.h  cmndline.h netrc.h\
-	  md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h 
+	  md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h \
+	  macros.h
 
 # Source code for the core main library
 SOURCE+= pkgcache.cc version.cc depcache.cc \
@@ -53,7 +54,4 @@ HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
 
 HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 
-# Private header files
-HEADERS+= system.h
-
 include $(LIBRARY_H)
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index e8ee75b96..4a0f3ee58 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -35,7 +35,6 @@
 #include <unistd.h>
 
 #include <ctype.h>
-#include <system.h>
 									/*}}}*/
 
 using std::string;
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index f988c1018..3eeb18cae 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -21,6 +21,7 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/macros.h>
 
 #include <apt-pkg/tagfile.h>
 
@@ -32,7 +33,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
-#include <system.h>
 									/*}}}*/
 typedef vector<pkgIndexFile *>::iterator FileIterator;
 
diff --git a/debian/changelog b/debian/changelog
index c7a733255..5e90bb96e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ apt (0.7.25.3) UNRELEASED; urgency=low
   * French translation update.
 
   [ David Kalnischkies ]
+  * apt-pkg/contrib/macros.h:
+    - move the header system.h with a new name to the public domain,
+      to be able to use it in other headers (Closes: #567662)
   * cmdline/acqprogress.cc:
     - Set Mode to Medium so that the correct prefix is used.
       Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243)
diff --git a/test/versiontest.cc b/test/versiontest.cc
index 5438eb4de..4ede4b280 100644
--- a/test/versiontest.cc
+++ b/test/versiontest.cc
@@ -14,7 +14,7 @@
    
    ##################################################################### */
 									/*}}}*/
-#include <system.h>
+#include <apt-pkg/macros.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/debversion.h>