Fix bug #1764 plugin_list shadows global variable of mysql 5.5

[bacula/bacula] / bacula / src / filed / xattr.h

diff --git a/bacula/src/filed/xattr.h b/bacula/src/filed/xattr.h
index ff2587ed9d53e1cc6c4818195d2ac6689004c141..e84c87b994f2aded89d5b7b0150a59b5f21027e7 100644 (file)
--- a/bacula/src/filed/xattr.h
+++ b/bacula/src/filed/xattr.h
@@ -6,7 +6,7 @@
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or

-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public

    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 


@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 

-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License

    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.


@@ -29,6 +29,12 @@
 #ifndef __XATTR_H
 #define __XATTR_H
 
 #ifndef __XATTR_H
 #define __XATTR_H
 

+#if defined(HAVE_LINUX_OS)
+#define BXATTR_ENOTSUP EOPNOTSUPP
+#elif defined(HAVE_DARWIN_OS)
+#define BXATTR_ENOTSUP ENOTSUP
+#endif
+

 /*
  * Magic used in the magic field of the xattr struct.
  * This way we can see we encounter a valid xattr struct.
 /*
  * Magic used in the magic field of the xattr struct.
  * This way we can see we encounter a valid xattr struct.


@@ -54,6 +60,9 @@ struct xattr_link_cache_entry_t {
    char target[PATH_MAX];
 };
 
    char target[PATH_MAX];
 };
 

+#define BXATTR_FLAG_SAVE_NATIVE    0x01
+#define BXATTR_FLAG_RESTORE_NATIVE 0x02
+

 /*
  * Internal tracking data.
  */
 /*
  * Internal tracking data.
  */


@@ -63,6 +72,8 @@ struct xattr_data_t {
    uint32_t nr_errors;
    uint32_t nr_saved;
    alist *link_cache;
    uint32_t nr_errors;
    uint32_t nr_saved;
    alist *link_cache;

+   uint32_t current_dev;
+   uint32_t flags;              /* See BXATTR_FLAG_* */

 };
 
 /*
 };
 
 /*