remove GROUP BY on db_get_job_volume_names. REVIEW.

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

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index fa0ea3fa736eed717b755688976cbab90963a7d1..80d6eba43c2862ffefffc51e35db1dd19ae38ea2 100644 (file)
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -1,25 +1,26 @@
 /*
  * bacula.h -- main header file to include in all Bacula source
  *
+ *   Version $Id$
  */
 
 /*
-
-   Copyright (C) 2000, 2001 Kern Sibbald and John Walker
+   Copyright (C) 2000, 2001, 2002 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.
+   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.
+   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.
+   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.
 
  */
 
@@ -27,15 +28,21 @@
 #define _BACULA_H 1
 
 #include "config.h"
+#include "host.h"
 
 #define _REENTRANT    1
 #define _THREAD_SAFE  1
 #define _POSIX_PTHREAD_SEMANTICS 1
 
 /* System includes */
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#if HAVE_STDARG_H
 #include <stdarg.h>
+#endif
 #include <stdio.h>
-#if STDC_HEADERS
+#if HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #if HAVE_UNISTD_H
@@ -47,21 +54,26 @@
 #include <errno.h>
 #include <fcntl.h>
 
+#ifdef xxxxx
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
 #else
 #include "lib/getopt.h"
 #endif
+#endif 
 
 #include <string.h>
 #include <strings.h>
 #include <signal.h>
 #include <ctype.h>
+#ifndef _SPLINT_
 #include <syslog.h>
+#endif
 #if HAVE_LIMITS_H
 #include <limits.h>
 #endif
 #include <pwd.h>
+#include <grp.h>
 #include <time.h>
 #include <netdb.h>
 #include <sys/types.h>
@@ -69,7 +81,9 @@
 #include <sys/bitypes.h>
 #endif
 #include <sys/ioctl.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
 #include <sys/stat.h>
 #include <sys/time.h>
 #if HAVE_SYS_WAIT_H
@@ -83,8 +97,12 @@
  *  includes before these.  
  */
 #include "version.h"
-#include "baconfig.h"
 #include "bc_types.h"
+#include "baconfig.h"
 #include "lib/lib.h"
 
+#ifndef HAVE_ZLIB_H
+#undef HAVE_LIBZ                      /* no good without headers */
+#endif
+
 #endif