diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-31 18:56:26 -0800 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-31 18:56:26 -0800 |
| commit | aea7f4c877f3091180ad5f418793f796bb82f255 (patch) | |
| tree | 3913ac47c75f51533d9e74f093335f7f9cfc04ac /apt-pkg/contrib | |
| parent | 2893f7b5ec6b2220ccfca6b9648482a6df926eca (diff) | |
| download | apt-aea7f4c877f3091180ad5f418793f796bb82f255.tar.gz | |
merge r1966..1967 from lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/hashes.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/contrib/macros.h (renamed from apt-pkg/contrib/system.h) | 7 | ||||
| -rw-r--r-- | apt-pkg/contrib/md5.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/contrib/sha1.cc | 2 |
4 files changed, 7 insertions, 9 deletions
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 /*{{{*/ |