From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 27 Feb 2020 11:47:52 +0000 (+0100)
Subject: Fix workaround for Sun C++ recommended by Phil Stracchino
X-Git-Tag: Release-9.6.3~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9120e79d10ccf2189752e8d2156b34a938055bc;p=thirdparty%2Fbacula.git

Fix workaround for Sun C++ recommended by Phil Stracchino
---

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index dacb235fe..85d0e5641 100644
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -1157,9 +1157,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
@@ -1262,8 +1262,10 @@
    restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict
+#ifndef __restrict__
 # define __restrict__
 #endif
+#endif
 
 /* Define to empty if the C compiler doesn't support this keyword. */
 #undef signed