diff --git a/proofd/src/XrdProofConn.cxx b/proofd/src/XrdProofConn.cxx
index 0f599ac8c922f0eaddfe1df43b8fdca366e64fc1..37d20085936f55ac4c704265377aa28d7613e7dc 100644
--- a/proofd/src/XrdProofConn.cxx
+++ b/proofd/src/XrdProofConn.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name:  $:$Id: XrdProofConn.cxx,v 1.4 2006/03/01 15:46:33 rdm Exp $
+// @(#)root/proofd:$Name:  $:$Id: XrdProofConn.cxx,v 1.5 2006/03/16 09:08:08 rdm Exp $
 // Author: Gerardo Ganis  12/12/2005
 
 /*************************************************************************
@@ -66,7 +66,9 @@ typedef XrdSecProtocol *(*XrdSecGetProt_t)(const char *, const struct sockaddr &
 
 XrdClientConnectionMgr *XrdProofConn::fgConnMgr = 0;
 
+#ifndef SafeDelete
 #define SafeDelete(x) { if (x) { delete x; x = 0; } }
+#endif
 #define URLTAG "["<<fUrl.Host<<":"<<fUrl.Port<<"]"
 
 //_____________________________________________________________________________
diff --git a/proofd/src/XrdProofServProxy.cxx b/proofd/src/XrdProofServProxy.cxx
index b8f438fd7b43cee18c45c6ea616020d2318768d9..d89123a2bac1b05effac13207af48a0b2faa6145 100644
--- a/proofd/src/XrdProofServProxy.cxx
+++ b/proofd/src/XrdProofServProxy.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name:  $:$Id: XrdProofServProxy.cxx,v 1.2 2005/12/12 16:42:14 rdm Exp $
+// @(#)root/proofd:$Name:  $:$Id: XrdProofServProxy.cxx,v 1.3 2006/03/01 15:46:12 rdm Exp $
 // Author: Gerardo Ganis  12/12/2005
 
 /*************************************************************************
@@ -23,8 +23,9 @@
 extern XrdOucTrace *XrdProofdTrace;
 static const char *TraceID = " ";
 #define TRACEID TraceID
-
-#define SafeDelete(x) { if (x) delete x; x = 0; }
+#ifndef SafeDelete
+#define SafeDelete(x) { if (x) { delete x; x = 0; } }
+#endif
 
 //__________________________________________________________________________
 XrdProofServProxy::XrdProofServProxy()
diff --git a/proofd/src/XrdProofdProtocol.cxx b/proofd/src/XrdProofdProtocol.cxx
index 1413644e3086c8562908e39f11c800754b09c4c2..fa76920bfcb975079a86a4173bccb1633a84d247 100644
--- a/proofd/src/XrdProofdProtocol.cxx
+++ b/proofd/src/XrdProofdProtocol.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name:  $:$Id: XrdProofdProtocol.cxx,v 1.5 2006/03/01 15:46:12 rdm Exp $
+// @(#)root/proofd:$Name:  $:$Id: XrdProofdProtocol.cxx,v 1.6 2006/03/16 16:41:59 rdm Exp $
 // Author: Gerardo Ganis  12/12/2005
 
 /*************************************************************************
@@ -117,7 +117,7 @@ XrdProofdProtocol::fgProtStack("ProtStack", "xproofd protocol anchor");
 #define TRACELINK lp
 #define TRACEID gTraceID
 #ifndef SafeDelete
-#define SafeDelete(x) { if (x) delete x; x = 0; }
+#define SafeDelete(x) { if (x) { delete x; x = 0; } }
 #endif
 #define INRANGE(x,y) ((x >= 0) && (x < (int)y.size()))