From: Marco van Wieringen <mvw@planets.elm.net>
Date: Mon, 6 Jul 2009 19:00:46 +0000 (+0200)
Subject: Small changes to ifdef layout.
X-Git-Tag: Release-7.0.0~2650^2~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=35f23fb009bd9265d3054843b4a927dd2d643e7f;p=bacula%2Fbacula

Small changes to ifdef layout.
---

diff --git a/bacula/src/filed/acl.c b/bacula/src/filed/acl.c
index 1a633f62bf..921873a02b 100644
--- a/bacula/src/filed/acl.c
+++ b/bacula/src/filed/acl.c
@@ -158,11 +158,11 @@ static bsub_exit_code aix_parse_acl_streams(JCR *jcr, int stream)
 static bsub_exit_code (*os_build_acl_streams)(JCR *jcr, FF_PKT *ff_pkt) = aix_build_acl_streams;
 static bsub_exit_code (*os_parse_acl_streams)(JCR *jcr, int stream) = aix_parse_acl_streams;
 
-#elif defined(HAVE_DARWIN_OS) \
-   || defined(HAVE_FREEBSD_OS) \
-   || defined(HAVE_IRIX_OS) \
-   || defined(HAVE_OSF1_OS) \
-   || defined(HAVE_LINUX_OS)
+#elif defined(HAVE_DARWIN_OS) || \
+      defined(HAVE_FREEBSD_OS) || \
+      defined(HAVE_IRIX_OS) || \
+      defined(HAVE_OSF1_OS) || \
+      defined(HAVE_LINUX_OS)
 
 #include <sys/types.h>
 
@@ -249,7 +249,8 @@ static bool acl_is_trivial(acl_t acl)
    */
    acl_entry_t ace;
    acl_tag_t tag;
-#if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS)
+#if defined(HAVE_FREEBSD_OS) || \
+    defined(HAVE_LINUX_OS)
    int entry_available;
 
    entry_available = acl_get_entry(acl, ACL_FIRST_ENTRY, &ace);
@@ -544,7 +545,9 @@ static bsub_exit_code darwin_parse_acl_streams(JCR *jcr, int stream)
 static bsub_exit_code (*os_build_acl_streams)(JCR *jcr, FF_PKT *ff_pkt) = darwin_build_acl_streams;
 static bsub_exit_code (*os_parse_acl_streams)(JCR *jcr, int stream) = darwin_parse_acl_streams;
 
-#elif defined(HAVE_FREEBSD_OS) || defined(HAVE_IRIX_OS) || defined(HAVE_LINUX_OS)
+#elif defined(HAVE_FREEBSD_OS) || \
+      defined(HAVE_IRIX_OS) || \
+      defined(HAVE_LINUX_OS)
 
 /*
  * Define the supported ACL streams for these OSes
diff --git a/bacula/src/filed/xattr.c b/bacula/src/filed/xattr.c
index 0e88059e73..9f52e0274d 100644
--- a/bacula/src/filed/xattr.c
+++ b/bacula/src/filed/xattr.c
@@ -117,10 +117,10 @@ static bsub_exit_code send_xattr_stream(JCR *jcr, int stream)
  * This is a supported OS, See what kind of interface we should use.
  * Start with the generic interface used by most OS-es.
  */
-#if defined(HAVE_DARWIN_OS) \
-   || defined(HAVE_FREEBSD_OS) \
-   || defined(HAVE_LINUX_OS) \
-   || defined(HAVE_NETBSD_OS)
+#if defined(HAVE_DARWIN_OS) || \
+    defined(HAVE_FREEBSD_OS) || \
+    defined(HAVE_LINUX_OS) || \
+    defined(HAVE_NETBSD_OS)
        
 #ifdef HAVE_SYS_XATTR_H
 #include <sys/xattr.h>