Cleanup new timeout code for bconsole

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

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index e54f653c856b913bc6ff2fdb02b7d036d5f954af..ab0ba1abd02449e2f99935184ade6a348c0ed0a5 100644 (file)
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 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.
@@ -34,6 +34,13 @@
 #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 +65,10 @@
 
 /* System includes */
 #if HAVE_STDINT_H
+#ifndef __sgi
 #include <stdint.h>
 #endif
+#endif
 #if HAVE_STDARG_H
 #include <stdarg.h>
 #endif