X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fbc_types.h;h=659ce1c58dcbfbe322ef77f310bc45afebbeb566;hb=eadfe3c5f02b3140a18864e828f3609ac67a9584;hp=76ecd86d58b75bce679fb49543de15afce0db8c0;hpb=2c849ac0ac604657f9fef02b305d2da5184f03b1;p=bacula%2Fbacula diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h index 76ecd86d58..659ce1c58d 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; @@ -247,5 +247,11 @@ enum { CF_CREATED /* file created, no data to extract */ }; +#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 */