Merge branch 'pu/macro-cleanup' into 'master'

Pu/macro cleanup

See merge request apt-team/apt!91

1 files changed, 3 insertions, 34 deletions

diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index c19cb313d..340549fbd 100644
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -13,40 +13,9 @@
 #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))  )))
-#define	MAX_VAL(t)	(((t)(-1) > 0) ? (t)(-1) : (t)(((1L<<(sizeof(t)*8-1))-1)))
-
-// Min/Max functions
-#if !defined(MIN)
-#if defined(__HIGHC__)
-#define MIN(x,y) _min(x,y)
-#define MAX(x,y) _max(x,y)
-#endif
-
-// GNU C++ has a min/max operator <coolio>
-#if defined(__GNUG__)
-#define MIN(A,B) ((A) <? (B))
-#define MAX(A,B) ((A) >? (B))
-#endif
-
-/* Templates tend to mess up existing code that uses min/max because of the
-   strict matching requirements */
-#if !defined(MIN)
-#define MIN(A,B) ((A) < (B)?(A):(B))
-#define MAX(A,B) ((A) > (B)?(A):(B))
-#endif
-#endif
-
-/* Bound functions, bound will return the value b within the limits a-c
-   bounv will change b so that it is within the limits of a-c. */
-#define _bound(a,b,c) MIN(c,MAX(b,a))
-#define _boundv(a,b,c) b = _bound(a,b,c)
-#define ABS(a) (((a) < (0)) ?-(a) : (a))
-
 /* Useful count macro, use on an array of things and it will return the
    number of items in the array */
-#define _count(a) (sizeof(a)/sizeof(a[0]))
+#define APT_ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 
 // Flag Macros
 #define	FLAG(f)			(1L << (f))
@@ -60,6 +29,7 @@
 #define APT_GCC_VERSION 0
 #endif
 
+#ifdef APT_COMPILING_APT
 /* likely() and unlikely() can be used to mark boolean expressions
    as (not) likely true which will help the compiler to optimise */
 #if APT_GCC_VERSION >= 0x0300
@@ -69,12 +39,12 @@
 	#define likely(x)	(x)
 	#define unlikely(x)	(x)
 #endif
+#endif
 
 #if APT_GCC_VERSION >= 0x0300
 	#define APT_DEPRECATED	__attribute__ ((deprecated))
 	#define APT_DEPRECATED_MSG(X)	__attribute__ ((deprecated(X)))
 	// __attribute__((const)) is too dangerous for us, we end up using it wrongly
-	#define APT_CONST	__attribute__((pure))
 	#define APT_PURE	__attribute__((pure))
 	#define APT_NORETURN	__attribute__((noreturn))
 	#define APT_PRINTF(n)	__attribute__((format(printf, n, n + 1)))
@@ -83,7 +53,6 @@
 #else
 	#define APT_DEPRECATED
 	#define APT_DEPRECATED_MSG
-	#define APT_CONST
 	#define APT_PURE
 	#define APT_NORETURN
 	#define APT_PRINTF(n)