X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fbacula.h;h=f17856f082509bbc9a6db3f9a05e32454fea2cd6;hb=6660e0b2cb6966c329b9fbfe69f8506df07c8a06;hp=07b1af6ceacdb9a10c7e37eaf8eeefe5495899e2;hpb=96b5a35445f44883b30a51081ed31f9300db530b;p=bacula%2Fbacula

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index 07b1af6cea..f17856f082 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
@@ -58,8 +64,10 @@
 
 /* System includes */
 #if HAVE_STDINT_H
+#ifndef __sgi
 #include <stdint.h>
 #endif
+#endif
 #if HAVE_STDARG_H
 #include <stdarg.h>
 #endif