kes Implement FD version to allow easier protocol changes.

[bacula/bacula] / bacula / src / bc_types.h

diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index 3229b35d0e6aaa8b8e795796e534e127a2f665e3..bd63176d301350e03e1bbaed587a8f5c71012bbf 100644 (file)
--- a/bacula/src/bc_types.h
+++ b/bacula/src/bc_types.h
@@ -1,4 +1,33 @@
 /*
 /*

+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+
+   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
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   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
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+    Define integer types for Bacula -- Kern Sibbald
+

     Integer types.  These types should be be used in all
     contexts in which the length of an integer stored on
     removable media must be known regardless of the
     Integer types.  These types should be be used in all
     contexts in which the length of an integer stored on
     removable media must be known regardless of the


@@ -14,25 +43,6 @@
     Version $Id$
 
  */
     Version $Id$
 
  */

-/*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   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 along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
-
- */

 
 
 #ifndef __bc_types_INCLUDED
 
 
 #ifndef __bc_types_INCLUDED


@@ -52,7 +62,7 @@ typedef unsigned int u_int;
 
 #ifndef HAVE_INTXX_T
 # if (SIZEOF_CHAR == 1)
 
 #ifndef HAVE_INTXX_T
 # if (SIZEOF_CHAR == 1)

-typedef char int8_t;
+typedef signed char int8_t;

 # else
 #  error "8 bit int type not found."
 # endif
 # else
 #  error "8 bit int type not found."
 # endif


@@ -162,7 +172,6 @@ typedef u_int64_t u_intmax_t;
 typedef double            float64_t;
 typedef float             float32_t;
 
 typedef double            float64_t;
 typedef float             float32_t;
 

-#endif /* __bc_types_INCLUDED */

 
 /* Define the uint versions actually used in Bacula */
 #ifndef uint8_t
 
 /* Define the uint versions actually used in Bacula */
 #ifndef uint8_t


@@ -178,10 +187,6 @@ typedef float             float32_t;
 /* Unix time (time_t) widened to 64 bits */
 #define utime_t int64_t
 
 /* Unix time (time_t) widened to 64 bits */
 #define utime_t int64_t
 

-#ifdef HAVE_CYGWIN
-#define int_least16_t int32_t
-#endif
-

 #ifndef HAVE_SOCKLEN_T
 #define socklen_t int
 #endif
 #ifndef HAVE_SOCKLEN_T
 #define socklen_t int
 #endif


@@ -191,3 +196,5 @@ typedef float             float32_t;
 #else
 #define sockopt_val_t void *
 #endif
 #else
 #define sockopt_val_t void *
 #endif

+
+#endif /* __bc_types_INCLUDED */