X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fbaconfig.h;h=c341826e7c6a3784d2ddeb5761aedc8549767fa5;hb=3264906afa9511c2f14edeab96b66864459732f1;hp=1974c5a88b02ff1c493854a5368fdba91ef2abf4;hpb=f4de30c9383b16c70e6ad740a6184d6741ebc394;p=bacula%2Fbacula

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index 1974c5a88b..c341826e7c 100644
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -43,13 +43,6 @@
 #define TRUE  1
 #define FALSE 0
 
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
 #ifdef HAVE_TLS
 #define have_tls 1
 #else
@@ -294,7 +287,10 @@ void InitWinAPIWrapper();
 #define STREAM_ACL_SOLARIS_ACE           1013    /* Solaris specific ace_t string representation from
                                                   * from acl_totext (NFSv4 or ZFS acl)
                                                   */
-#define STREAM_XATTR_SOLARIS             1995    /* Solaris specific extented attributes and extensible attributes */
+#define STREAM_XATTR_SOLARIS_SYS         1994    /* Solaris specific extensible attributes or
+                                                  * otherwise named extended system attributes.
+                                                  */
+#define STREAM_XATTR_SOLARIS             1995    /* Solaris specific extented attributes */
 #define STREAM_XATTR_DARWIN              1996    /* Darwin (OSX) specific extended attributes */
 #define STREAM_XATTR_FREEBSD             1997    /* FreeBSD specific extended attributes */
 #define STREAM_XATTR_LINUX               1998    /* Linux specific extended attributes */