X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fbc_types.h;h=fe0471874841a66eba045d3069697374d62965d4;hb=2273b4ed03fe4a4c520f842ad8b5177254dd1ed5;hp=76ecd86d58b75bce679fb49543de15afce0db8c0;hpb=2c849ac0ac604657f9fef02b305d2da5184f03b1;p=bacula%2Fbacula

diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index 76ecd86d58..fe04718748 100644
--- a/bacula/src/bc_types.h
+++ b/bacula/src/bc_types.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
-   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.
 
@@ -15,7 +15,7 @@
    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.
@@ -57,7 +57,7 @@
  * In principle, the only field that really should need to be
  *  64 bits is the FileId_t
  */
-typedef uint32_t FileId_t;
+typedef uint64_t FileId_t;
 typedef uint32_t DBId_t;              /* general DB id type */
 typedef uint32_t JobId_t;
 
@@ -241,11 +241,18 @@ typedef float             float32_t;
  *   Used in findlib, filed, and plugins
  */
 enum {
-   CF_SKIP = 1,                       /* skip file (not newer or something) */
-   CF_ERROR,                          /* error creating file */
-   CF_EXTRACT,                        /* file created, data to extract */
-   CF_CREATED                         /* file created, no data to extract */
+   CF_SKIP = 1,                   /* skip file (not newer or something) */
+   CF_ERROR,                      /* error creating file */
+   CF_EXTRACT,                    /* file created, data to extract */
+   CF_CREATED,                    /* file created, no data to extract */
+   CF_CORE                        /* let bacula core handle the file creation */
 };
 
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
 
 #endif /* __bc_types_INCLUDED */