X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fbacula.h;h=ccaa9786932b98a469fe8e0b77109f692617a7a3;hb=2873e2a9dc34e5f95b7882bff85829b902c827d0;hp=fe95239896f91d2d057998c02ac771032cd0fba9;hpb=095ae896b3fa96e6c8db2105519552b785e6b005;p=bacula%2Fbacula

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index fe95239896..ccaa978693 100644
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -1,17 +1,12 @@
-/*
- * bacula.h -- main header file to include in all Bacula source
- *
- *   Version $Id$
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 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
+   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.
 
@@ -20,20 +15,31 @@
    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.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ * bacula.h -- main header file to include in all Bacula source
+ *
+ */
 
 #ifndef _BACULA_H
 #define _BACULA_H 1
 
+/* Disable FORTIFY_SOURCE, because bacula uses is own memory
+ * manager
+ */
+#ifdef _FORTIFY_SOURCE
+#undef _FORTIFY_SOURCE
+#endif
+
 #ifdef __cplusplus
 /* Workaround for SGI IRIX 6.5 */
 #define _LANGUAGE_C_PLUS_PLUS 1
@@ -48,6 +54,7 @@
 #else
 #include "config.h"
 #endif
+#define __CONFIG_H
 
 
 #define _REENTRANT    1
@@ -57,8 +64,10 @@
 
 /* System includes */
 #if HAVE_STDINT_H
+#ifndef __sgi
 #include <stdint.h>
 #endif
+#endif
 #if HAVE_STDARG_H
 #include <stdarg.h>
 #endif
@@ -160,6 +169,8 @@ extern "C" {
 
 #include "version.h"
 #include "bc_types.h"
+#include "streams.h"
+#include "filetypes.h"
 #include "baconfig.h"
 #include "lib/lib.h"