* merged with mainline

[apt.git] / apt-pkg / contrib / system.h

diff --git a/apt-pkg/contrib/system.h b/apt-pkg/contrib/system.h
index e652348b07b243553282ca1f528a3480736ede69..7ec3d7feb4d3f53a1b146e5f3bff275c71f108ed 100644 (file)
--- a/apt-pkg/contrib/system.h
+++ b/apt-pkg/contrib/system.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: system.h,v 1.1 1998/07/02 02:58:13 jgg Exp $
+// $Id: system.h,v 1.3 1999/12/10 23:40:29 jgg Exp $
 /* ######################################################################
    
    System Header - Usefull private definitions
@@ -11,7 +11,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Private header
-// Header section: /
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
@@ -20,6 +19,7 @@
 #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)
@@ -37,6 +37,7 @@
 #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. */