To prevent breakage of existing scripts, reorder the commands.

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

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index 2d4640cbc820ecbf2e8d5433251c6c058a12c5e2..0104a6eae187471aa594b2e6febc8f62afe89329 100644 (file)
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -1,19 +1,14 @@
-/*
- * 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-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 plus additions
-   that are listed in the file LICENSE.
+   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
@@ -25,11 +20,16 @@
    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
+ *
+ *   Version $Id$
+ */
 
 #ifndef _BACULA_H
 #define _BACULA_H 1
@@ -48,6 +48,7 @@
 #else
 #include "config.h"
 #endif
+#define __CONFIG_H
 
 
 #define _REENTRANT    1
@@ -57,8 +58,10 @@
 
 /* System includes */
 #if HAVE_STDINT_H
+#ifndef __sgi
 #include <stdint.h>
 #endif
+#endif
 #if HAVE_STDARG_H
 #include <stdarg.h>
 #endif