Fix Solaris 10 problems reported by Phil Stracchino

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

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index 2b89e96b0278b894089694c05dc53dc74a7e359f..bf33b78c824d47a5aad6da514b3d51cd86d809ee 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2017 Kern Sibbald
    Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
@@ -60,17 +60,17 @@
 
 #ifdef DEBUG
 #define ASSERT(x) if (!(x)) { \
-   char *jcr = NULL; \
+   char *tjcr = NULL; \
    Emsg1(M_ERROR, 0, _("Failed ASSERT: %s\n"), #x); \
    Pmsg1(000, _("Failed ASSERT: %s\n"), #x); \
-   jcr[0] = 0; }
+   tjcr[0] = 0; }
 
 #define ASSERT2(x,y) if (!(x)) { \
    set_assert_msg(__FILE__, __LINE__, y); \
    Emsg1(M_ERROR, 0, _("Failed ASSERT: %s\n"), #x); \
    Pmsg1(000, _("Failed ASSERT: %s\n"), #x); \
-   char *jcr = NULL; \
-   jcr[0] = 0; }
+   char *tjcr = NULL; \
+   tjcr[0] = 0; }
 #else
 #define ASSERT(x)
 #define ASSERT2(x, y)