svn commit: r527149 [2/5] - in /xerces/c/trunk: src/xercesc/dom/ src/xercesc/dom/impl/ src/xercesc/framework/ src/xercesc/framework/psvi/ src/xercesc/internal/ src/xercesc/parsers/ src/xercesc/sax/ src/xercesc/sax2/ src/xercesc/util/ src/xercesc/util/A...

[am...@apache.org]

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMDocumentTypeImpl_HEADER_GUARD_
-#define DOMDocumentTypeImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMDOCUMENTTYPEIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMDOCUMENTTYPEIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMElementImpl_HEADER_GUARD_
-#define DOMElementImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMELEMENTIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMELEMENTIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMElementNSImpl_HEADER_GUARD_
-#define DOMElementNSImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMELEMENTNSIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMELEMENTNSIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMEntityImpl_HEADER_GUARD_
-#define DOMEntityImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMENTITYIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMENTITYIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMEntityReferenceImpl_HEADER_GUARD_
-#define DOMEntityReferenceImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMENTITYREFERENCEIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMENTITYREFERENCEIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,12 +19,12 @@
  * $Id$
  */
 
-
-#ifndef DOMERRORIMPL_HPP
-#define DOMERRORIMPL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_DOMERRORIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMERRORIMPL_HPP
 
 #include <xercesc/dom/DOMError.hpp>
 #include <xercesc/util/XMLString.hpp>
+
 XERCES_CPP_NAMESPACE_BEGIN
 
 

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,5 +1,3 @@
-#ifndef DOMImplementationImpl_HEADER_GUARD_
-#define DOMImplementationImpl_HEADER_GUARD_
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMIMPLEMENTATIONIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMIMPLEMENTATIONIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,5 +1,3 @@
-#ifndef DOMImplementationListImpl_HEADER_GUARD_
-#define DOMImplementationListImpl_HEADER_GUARD_
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMIMPLEMENTATIONLISTIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMIMPLEMENTATIONLISTIMPL_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/util/RefVectorOf.hpp>

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLSInputImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLSInputImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLSInputImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSInputImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#ifndef DOMLSInputImpl_HEADER_GUARD_
-#define DOMLSInputImpl_HEADER_GUARD_
+#if !defined(XERCESC_INCLUDE_GUARD_DOMLSINPUTIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMLSINPUTIMPL_HPP
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/dom/DOMLSInput.hpp>

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLSOutputImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLSOutputImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLSOutputImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSOutputImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#ifndef DOMLSOutputImpl_HEADER_GUARD_
-#define DOMLSOutputImpl_HEADER_GUARD_
+#if !defined(XERCESC_INCLUDE_GUARD_DOMLSOUTPUTIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMLSOUTPUTIMPL_HPP
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/dom/DOMLSOutput.hpp>

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#ifndef DOMLSSerializerImpl_HEADER_GUARD_
-#define DOMLSSerializerImpl_HEADER_GUARD_
+#if !defined(XERCESC_INCLUDE_GUARD_DOMLSSERIALIZERMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMLSSERIALIZERMPL_HPP
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/dom/DOMLSSerializer.hpp>

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,15 +19,12 @@
  * $Id$
  */
 
-
-#ifndef DOMLOCATORIMPL_HPP
-#define DOMLOCATORIMPL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_DOMLOCATORIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMLOCATORIMPL_HPP
 
 #include <xercesc/dom/DOMLocator.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
-
-
 
 /**
   * Introduced in DOM Level 3

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMNamedNodeMapImpl_HEADER_GUARD_
-#define DOMNamedNodeMapImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMNAMEDNODEMAPIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMNAMEDNODEMAPIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMNodeIDMap_HEADER_GUARD_
-#define DOMNodeIDMap_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMNODEIDMAP_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMNODEIDMAP_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMNodeImpl_HEADER_GUARD_
-#define DOMNodeImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMNODEIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMNODEIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMNodeIteratorImpl_HEADER_GUARD_
-#define DOMNodeIteratorImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMNODEITERATORIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMNODEITERATORIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,5 +1,3 @@
-#ifndef DOMNodeListImpl_HEADER_GUARD_
-#define DOMNodeListImpl_HEADER_GUARD_
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMNODELISTIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMNODELISTIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp Tue Apr 10 07:56:39 2007
@@ -1,5 +1,3 @@
-#ifndef DOMNodeVector_HEADER_GUARD_
-#define DOMNodeVector_HEADER_GUARD_
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMNODEVECTOR_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMNODEVECTOR_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMNormalizer_HEADER_GUARD_
-#define DOMNormalizer_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +15,12 @@
  * limitations under the License.
  */
 
+/*
+ * $Id$
+ */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMNORMALIZER_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMNORMALIZER_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNotationImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNotationImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNotationImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNotationImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,5 +1,3 @@
-#ifndef DOMNotationImpl_HEADER_GUARD_
-#define DOMNotationImpl_HEADER_GUARD_
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMNOTATIONIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMNOTATIONIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.hpp Tue Apr 10 07:56:39 2007
@@ -1,7 +1,3 @@
-#ifndef DOMParentNode_HEADER_GUARD_
-#define DOMParentNode_HEADER_GUARD_
-
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMPARENTNODE_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMPARENTNODE_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,5 +1,3 @@
-#ifndef DOMProcessingInstructionImpl_HEADER_GUARD_
-#define DOMProcessingInstructionImpl_HEADER_GUARD_
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMPROCESSINGINSTRUCTIONIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMPROCESSINGINSTRUCTIONIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMRangeImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMRangeImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMRangeImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMRangeImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMRangeImpl_HEADER_GUARD_
-#define DOMRangeImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
  /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMRANGEIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMRANGEIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,5 +1,3 @@
-#ifndef DOMStringListImpl_HEADER_GUARD_
-#define DOMStringListImpl_HEADER_GUARD_
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMSTRINGLISTIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMSTRINGLISTIMPL_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/util/RefVectorOf.hpp>

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMStringPool.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMStringPool.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMStringPool.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMStringPool.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMStringPool_HEADER_GUARD_
-#define DOMStringPool_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMSTRINGPOOL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMSTRINGPOOL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMTextImpl_HEADER_GUARD_
-#define DOMTextImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMTEXTIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMTEXTIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMTreeWalkerImpl_HEADER_GUARD_
-#define DOMTreeWalkerImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMTREEWALKERIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMTREEWALKERIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp Tue Apr 10 07:56:39 2007
@@ -25,8 +25,8 @@
 //
 
 
-#if !defined(DOMTYPEINFOIMPL_HPP)
-#define DOMTYPEINFOIMPL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_DOMTYPEINFOIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMTYPEINFOIMPL_HPP
 
 //------------------------------------------------------------------------------------
 //  Includes

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMXPathExpressionImpl_HEADER_GUARD_
-#define DOMXPathExpressionImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -17,6 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/*
+ * $Id: $
+ */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMXPATHEXPRESSIONIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMXPATHEXPRESSIONIMPL_HPP
 
 #include <xercesc/util/XMemory.hpp>
 #include <xercesc/util/PlatformUtils.hpp>

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMXPathNSResolverImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMXPathNSResolverImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMXPathNSResolverImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMXPathNSResolverImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMXPathNSResolverImpl_HEADER_GUARD_
-#define DOMXPathNSResolverImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -17,6 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/*
+ * $Id: $
+ */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMXPATHNSRESOLVERIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMXPATHNSRESOLVERIMPL_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/dom/DOMXPathNSResolver.hpp>

Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMXPathResultImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMXPathResultImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMXPathResultImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMXPathResultImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef DOMXPathResultImpl_HEADER_GUARD_
-#define DOMXPathResultImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -17,6 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/*
+ * $Id: $
+ */
+
+#if !defined(XERCESC_INCLUDE_GUARD_DOMXPATHRESULTIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_DOMXPATHRESULTIMPL_HPP
 
 #include <xercesc/util/XMemory.hpp>
 #include <xercesc/dom/DOMXPathResult.hpp>

Modified: xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.hpp Tue Apr 10 07:56:39 2007
@@ -1,6 +1,3 @@
-#ifndef XSDElementNSImpl_HEADER_GUARD_
-#define XSDElementNSImpl_HEADER_GUARD_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +18,9 @@
 /*
  * $Id$
  */
+
+#if !defined(XERCESC_INCLUDE_GUARD_XSDELEMENTNSIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_XSDELEMENTNSIMPL_HPP
 
 //
 //  This file is part of the internal implementation of the C++ XML DOM.

Modified: xerces/c/trunk/src/xercesc/framework/BinOutputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/BinOutputStream.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/BinOutputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/BinOutputStream.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(BIN_OUTPUT_STREAM_HPP)
-#define BIN_OUTPUT_STREAM_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_BIN_OUTPUT_STREAM_HPP)
+#define XERCESC_INCLUDE_GUARD_BIN_OUTPUT_STREAM_HPP
 
 #include <xercesc/util/XMemory.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/LocalFileFormatTarget.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/LocalFileFormatTarget.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/LocalFileFormatTarget.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/LocalFileFormatTarget.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef LocalFileFormatTarget_HEADER_GUARD_
-#define LocalFileFormatTarget_HEADER_GUARD_
+#if !defined(XERCESC_INCLUDE_GUARD_LOCALFILEFORMATTARGET_HPP)
+#define XERCESC_INCLUDE_GUARD_LOCALFILEFORMATTARGET_HPP
 
 #include <xercesc/framework/XMLFormatter.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/LocalFileInputSource.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/LocalFileInputSource.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/LocalFileInputSource.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/LocalFileInputSource.hpp Tue Apr 10 07:56:39 2007
@@ -20,8 +20,8 @@
  */
 
 
-#if !defined(LOCALFILEINPUTSOURCE_HPP)
-#define LOCALFILEINPUTSOURCE_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_LOCALFILEINPUTSOURCE_HPP)
+#define XERCESC_INCLUDE_GUARD_LOCALFILEINPUTSOURCE_HPP
 
 #include <xercesc/sax/InputSource.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/MemBufFormatTarget.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/MemBufFormatTarget.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/MemBufFormatTarget.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/MemBufFormatTarget.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef MemBufFormatTarget_HEADER_GUARD_
-#define MemBufFormatTarget_HEADER_GUARD_
+#if !defined(XERCESC_INCLUDE_GUARD_MEMBUFFORMATTARGET_HPP)
+#define XERCESC_INCLUDE_GUARD_MEMBUFFORMATTARGET_HPP
 
 #include <xercesc/framework/XMLFormatter.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/MemBufInputSource.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/MemBufInputSource.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/MemBufInputSource.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/MemBufInputSource.hpp Tue Apr 10 07:56:39 2007
@@ -20,8 +20,8 @@
  */
 
 
-#if !defined(MEMBUFINPUTSOURCE_HPP)
-#define MEMBUFINPUTSOURCE_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_MEMBUFINPUTSOURCE_HPP)
+#define XERCESC_INCLUDE_GUARD_MEMBUFINPUTSOURCE_HPP
 
 #include <xercesc/sax/InputSource.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/MemoryManager.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/MemoryManager.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/MemoryManager.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/MemoryManager.hpp Tue Apr 10 07:56:39 2007
@@ -20,8 +20,8 @@
  */
 
 
-#if !defined(MEMORYMANAGER_HPP)
-#define MEMORYMANAGER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_MEMORYMANAGER_HPP)
+#define XERCESC_INCLUDE_GUARD_MEMORYMANAGER_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 #include <stdlib.h>

Modified: xerces/c/trunk/src/xercesc/framework/StdInInputSource.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/StdInInputSource.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/StdInInputSource.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/StdInInputSource.hpp Tue Apr 10 07:56:39 2007
@@ -20,8 +20,8 @@
  */
 
 
-#if !defined(STDININPUTSOURCE_HPP)
-#define STDININPUTSOURCE_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_STDININPUTSOURCE_HPP)
+#define XERCESC_INCLUDE_GUARD_STDININPUTSOURCE_HPP
 
 #include <xercesc/sax/InputSource.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/StdOutFormatTarget.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/StdOutFormatTarget.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/StdOutFormatTarget.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/StdOutFormatTarget.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef StdOutFormatTarget_HEADER_GUARD_
-#define StdOutFormatTarget_HEADER_GUARD_
+#if !defined(XERCESC_INCLUDE_GUARD_STDOUTFORMATTARGET_HPP)
+#define XERCESC_INCLUDE_GUARD_STDOUTFORMATTARGET_HPP
 
 #include <xercesc/framework/XMLFormatter.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/URLInputSource.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/URLInputSource.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/URLInputSource.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/URLInputSource.hpp Tue Apr 10 07:56:39 2007
@@ -19,10 +19,8 @@
  * $Id$
  */
 
-
-
-#if !defined(URLINPUTSOURCE_HPP)
-#define URLINPUTSOURCE_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_URLINPUTSOURCE_HPP)
+#define XERCESC_INCLUDE_GUARD_URLINPUTSOURCE_HPP
 
 #include <xercesc/util/XMLURL.hpp>
 #include <xercesc/sax/InputSource.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/ValidationContext.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/ValidationContext.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/ValidationContext.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/ValidationContext.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(VALIDATION_CONTEXT_HPP)
-#define VALIDATION_CONTEXT_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_VALIDATION_CONTEXT_HPP)
+#define XERCESC_INCLUDE_GUARD_VALIDATION_CONTEXT_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/RefHashTableOf.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#ifndef WRAPPER4DOMINPUTSOURCE_HPP
-#define WRAPPER4DOMINPUTSOURCE_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_WRAPPER4DOMLSINPUT_HPP)
+#define XERCESC_INCLUDE_GUARD_WRAPPER4DOMLSINPUT_HPP
 
 #include <xercesc/sax/InputSource.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#ifndef WRAPPER4INPUTSOURCE_HPP
-#define WRAPPER4INPUTSOURCE_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_WRAPPER4INPUTSOURCE_HPP)
+#define XERCESC_INCLUDE_GUARD_WRAPPER4INPUTSOURCE_HPP
 
 #include <xercesc/dom/DOMLSInput.hpp>
 #include <xercesc/util/PlatformUtils.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLAttDef.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLAttDef.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLAttDef.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLAttDef.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(ATTDEF_HPP)
-#define ATTDEF_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLATTDEF_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLATTDEF_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/XMLString.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLAttDefList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLAttDefList.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLAttDefList.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLAttDefList.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLATTDEFLIST_HPP)
-#define XMLATTDEFLIST_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLATTDEFLIST_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLATTDEFLIST_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/util/XMemory.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLAttr.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLAttr.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLAttr.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLAttr.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLATTR_HPP)
-#define XMLATTR_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLATTR_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLATTR_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/QName.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLBuffer.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLBuffer.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLBuffer.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLBuffer.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(XMLBUFFER_HPP)
-#define XMLBUFFER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLBUFFER_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLBUFFER_HPP
 
 #include <xercesc/util/XMemory.hpp>
 #include <xercesc/util/PlatformUtils.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLBufferMgr.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLBufferMgr.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLBufferMgr.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLBufferMgr.hpp Tue Apr 10 07:56:39 2007
@@ -15,8 +15,12 @@
  * limitations under the License.
  */
 
-#if !defined(XMLBUFFERMGR_HPP)
-#define XMLBUFFERMGR_HPP
+/*
+ * $Id$
+ */
+
+#if !defined(XERCESC_INCLUDE_GUARD_XMLBUFFERMGR_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLBUFFERMGR_HPP
 
 #include <xercesc/framework/XMLBuffer.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/XMLContentModel.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLContentModel.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLContentModel.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLContentModel.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(CONTENTMODEL_HPP)
-#define CONTENTMODEL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLCONTENTMODEL_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLCONTENTMODEL_HPP
 
 #include <xercesc/util/XMemory.hpp>
 #include <xercesc/util/QName.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLDTDDescription.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLDTDDescription.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLDTDDescription.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLDTDDescription.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLDTDDESCRIPTION_HPP)
-#define XMLDTDDESCRIPTION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLDTDDESCRIPTION_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLDTDDESCRIPTION_HPP
 
 #include <xercesc/framework/XMLGrammarDescription.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/XMLDocumentHandler.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLDocumentHandler.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLDocumentHandler.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLDocumentHandler.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(XMLDOCUMENTHANDLER_HPP)
-#define XMLDOCUMENTHANDLER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLDOCUMENTHANDLER_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLDOCUMENTHANDLER_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/util/RefVectorOf.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLElementDecl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLElementDecl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLElementDecl.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLElementDecl.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLELEMENTDECL_HPP)
-#define XMLELEMENTDECL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLELEMENTDECL_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLELEMENTDECL_HPP
 
 #include <xercesc/framework/XMLAttr.hpp>
 #include <xercesc/framework/XMLAttDefList.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLENTITYDECL_HPP)
-#define XMLENTITYDECL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLENTITYDECL_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLENTITYDECL_HPP
 
 #include <xercesc/util/XMemory.hpp>
 #include <xercesc/util/PlatformUtils.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLEntityHandler.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLEntityHandler.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLEntityHandler.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLEntityHandler.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(XMLENTITYHANDLER_HPP)
-#define XMLENTITYHANDLER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLENTITYHANDLER_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLENTITYHANDLER_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/XMLErrorCodes.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLErrorCodes.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLErrorCodes.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLErrorCodes.hpp Tue Apr 10 07:56:39 2007
@@ -1,7 +1,7 @@
 // This file is generated, don't edit it!!
 
-#if !defined(ERRHEADER_XMLErrs)
-#define ERRHEADER_XMLErrs
+#if !defined(XERCESC_INCLUDE_GUARD_ERRHEADER_XMLErrs)
+#define XERCESC_INCLUDE_GUARD_ERRHEADER_XMLErrs
 
 #include <xercesc/framework/XMLErrorReporter.hpp>
 #include <xercesc/util/XercesDefs.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(XMLERRORREPORTER_HPP)
-#define XMLERRORREPORTER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLERRORREPORTER_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLERRORREPORTER_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/XMLFormatter.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLFormatter.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLFormatter.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLFormatter.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLFORMATTER_HPP)
-#define XMLFORMATTER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLFORMATTER_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLFORMATTER_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/XMLGrammarDescription.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLGrammarDescription.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLGrammarDescription.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLGrammarDescription.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLGRAMMARDESCRIPTION_HPP)
-#define XMLGRAMMARDESCRIPTION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLGRAMMARDESCRIPTION_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLGRAMMARDESCRIPTION_HPP
 
 #include <xercesc/util/XMemory.hpp>
 #include <xercesc/validators/common/Grammar.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLGrammarPool.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLGrammarPool.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLGrammarPool.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLGrammarPool.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLGRAMMARPOOL_HPP)
-#define XMLGRAMMARPOOL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLGRAMMARPOOL_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLGRAMMARPOOL_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/RefHashTableOf.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLNotationDecl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLNotationDecl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLNotationDecl.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLNotationDecl.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLNOTATIONDECL_HPP)
-#define XMLNOTATIONDECL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLNOTATIONDECL_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLNOTATIONDECL_HPP
 
 #include <xercesc/util/XMemory.hpp>
 #include <xercesc/util/PlatformUtils.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLPScanToken.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLPScanToken.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLPScanToken.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLPScanToken.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(XMLPSCANTOKEN_HPP)
-#define XMLPSCANTOKEN_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLPSCANTOKEN_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLPSCANTOKEN_HPP
 
 #include <xercesc/util/XMemory.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/XMLRecognizer.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLRecognizer.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLRecognizer.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLRecognizer.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  *  $Id$
  */
 
-#if !defined(XMLRECOGNIZER_HPP)
-#define XMLRECOGNIZER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLRECOGNIZER_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLRECOGNIZER_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/util/PlatformUtils.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLRefInfo.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLRefInfo.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLRefInfo.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLRefInfo.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(XMLIDREFINFO_HPP)
-#define XMLIDREFINFO_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLREFINFO_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLREFINFO_HPP
 
 #include <xercesc/util/XMemory.hpp>
 #include <xercesc/util/PlatformUtils.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLSchemaDescription.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLSchemaDescription.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLSchemaDescription.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLSchemaDescription.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLSCHEMADESCRIPTION_HPP)
-#define XMLSCHEMADESCRIPTION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLSCHEMADESCRIPTION_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLSCHEMADESCRIPTION_HPP
 
 #include <xercesc/framework/XMLGrammarDescription.hpp>
 #include <xercesc/util/RefArrayVectorOf.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLValidator.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLValidator.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLValidator.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLValidator.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(XMLVALIDATOR_HPP)
-#define XMLVALIDATOR_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLVALIDATOR_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLVALIDATOR_HPP
 
 #include <xercesc/framework/XMLAttr.hpp>
 #include <xercesc/framework/XMLValidityCodes.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/XMLValidityCodes.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLValidityCodes.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLValidityCodes.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLValidityCodes.hpp Tue Apr 10 07:56:39 2007
@@ -1,7 +1,7 @@
 // This file is generated, don't edit it!!
 
-#if !defined(ERRHEADER_XMLValid)
-#define ERRHEADER_XMLValid
+#if !defined(XERCESC_INCLUDE_GUARD_ERRHEADER_XMLValid)
+#define XERCESC_INCLUDE_GUARD_ERRHEADER_XMLValid
 
 #include <xercesc/framework/XMLErrorReporter.hpp>
 #include <xercesc/util/XercesDefs.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/PSVIAttribute.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/PSVIAttribute.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/PSVIAttribute.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/PSVIAttribute.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(PSVIATTRIBUTE_HPP)
-#define PSVIATTRIBUTE_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_PSVIATTRIBUTE_HPP)
+#define XERCESC_INCLUDE_GUARD_PSVIATTRIBUTE_HPP
 
 #include <xercesc/framework/psvi/PSVIItem.hpp>
 #include <xercesc/framework/psvi/XSSimpleTypeDefinition.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/PSVIAttributeList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/PSVIAttributeList.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/PSVIAttributeList.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/PSVIAttributeList.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(PSVIATTRIBUTEDERIVATION_LIST_HPP)
-#define PSVIATTRIBUTEDERIVATION_LIST_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_PSVIATTRIBUTE_LIST_HPP)
+#define XERCESC_INCLUDE_GUARD_PSVIATTRIBUTE_LIST_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/framework/psvi/PSVIAttribute.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/PSVIElement.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/PSVIElement.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/PSVIElement.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/PSVIElement.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(PSVIELEMENT_HPP)
-#define PSVIELEMENT_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_PSVIELEMENT_HPP)
+#define XERCESC_INCLUDE_GUARD_PSVIELEMENT_HPP
 
 #include <xercesc/framework/psvi/PSVIItem.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/PSVIHandler.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/PSVIHandler.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/PSVIHandler.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/PSVIHandler.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(PSVIHANDLER_HPP)
-#define PSVIHANDLER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_PSVIHANDLER_HPP)
+#define XERCESC_INCLUDE_GUARD_PSVIHANDLER_HPP
 
 #include <xercesc/framework/psvi/PSVIElement.hpp>
 #include <xercesc/framework/psvi/PSVIAttributeList.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/PSVIItem.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/PSVIItem.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/PSVIItem.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/PSVIItem.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(PSVIITEM_HPP)
-#define PSVIITEM_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_PSVIITEM_HPP)
+#define XERCESC_INCLUDE_GUARD_PSVIITEM_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSANNOTATION_HPP)
-#define XSANNOTATION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSANNOTATION_HPP)
+#define XERCESC_INCLUDE_GUARD_XSANNOTATION_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 #include <xercesc/internal/XSerializable.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeDeclaration.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSATTRIBUTEDECLARATION_HPP)
-#define XSATTRIBUTEDECLARATION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSATTRIBUTEDECLARATION_HPP)
+#define XERCESC_INCLUDE_GUARD_XSATTRIBUTEDECLARATION_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeGroupDefinition.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeGroupDefinition.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeGroupDefinition.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeGroupDefinition.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSATTRIBUTEGROUPDEFINITION_HPP)
-#define XSATTRIBUTEGROUPDEFINITION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSATTRIBUTEGROUPDEFINITION_HPP)
+#define XERCESC_INCLUDE_GUARD_XSATTRIBUTEGROUPDEFINITION_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeUse.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeUse.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeUse.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSAttributeUse.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSATTRIBUTEUSE_HPP)
-#define XSATTRIBUTEUSE_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSATTRIBUTEUSE_HPP)
+#define XERCESC_INCLUDE_GUARD_XSATTRIBUTEUSE_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSComplexTypeDefinition.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSComplexTypeDefinition.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSComplexTypeDefinition.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSComplexTypeDefinition.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSCOMPLEXTYPEDEFINITION_HPP)
-#define XSCOMPLEXTYPEDEFINITION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSCOMPLEXTYPEDEFINITION_HPP)
+#define XERCESC_INCLUDE_GUARD_XSCOMPLEXTYPEDEFINITION_HPP
 
 #include <xercesc/framework/psvi/XSTypeDefinition.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSConstants.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSConstants.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSConstants.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSConstants.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSCONSTANTS_HPP)
-#define XSCONSTANTS_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSCONSTANTS_HPP)
+#define XERCESC_INCLUDE_GUARD_XSCONSTANTS_HPP
 
 #include <xercesc/util/RefVectorOf.hpp>
 #include <xercesc/util/RefArrayVectorOf.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSElementDeclaration.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSElementDeclaration.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSElementDeclaration.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSElementDeclaration.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSELEMENTDECLARATION_HPP)
-#define XSELEMENTDECLARATION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSELEMENTDECLARATION_HPP)
+#define XERCESC_INCLUDE_GUARD_XSELEMENTDECLARATION_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 #include <xercesc/framework/psvi/XSNamedMap.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSFacet.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSFacet.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSFacet.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSFacet.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSFACET_HPP)
-#define XSFACET_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSFACET_HPP)
+#define XERCESC_INCLUDE_GUARD_XSFACET_HPP
 
 #include <xercesc/framework/psvi/XSSimpleTypeDefinition.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSIDCDefinition.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSIDCDefinition.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSIDCDefinition.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSIDCDefinition.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSIDCDEFINITION_HPP)
-#define XSIDCDEFINITION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSIDCDEFINITION_HPP)
+#define XERCESC_INCLUDE_GUARD_XSIDCDEFINITION_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSModel.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSModel.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSModel.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSModel.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSMODEL_HPP)
-#define XSMODEL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSMODEL_HPP)
+#define XERCESC_INCLUDE_GUARD_XSMODEL_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/framework/psvi/XSObject.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSModelGroup.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSModelGroup.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSModelGroup.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSModelGroup.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSMODELGROUP_HPP)
-#define XSMODELGROUP_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSMODELGROUP_HPP)
+#define XERCESC_INCLUDE_GUARD_XSMODELGROUP_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSModelGroupDefinition.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSModelGroupDefinition.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSModelGroupDefinition.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSModelGroupDefinition.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSMODELGROUPDEFINITION_HPP)
-#define XSMODELGROUPDEFINITION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSMODELGROUPDEFINITION_HPP)
+#define XERCESC_INCLUDE_GUARD_XSMODELGROUPDEFINITION_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSMultiValueFacet.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSMultiValueFacet.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSMultiValueFacet.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSMultiValueFacet.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSMULTIVALUEFACET_HPP)
-#define XSMULTIVALUEFACET_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSMULTIVALUEFACET_HPP)
+#define XERCESC_INCLUDE_GUARD_XSMULTIVALUEFACET_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 #include <xercesc/framework/psvi/XSSimpleTypeDefinition.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSNamedMap.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSNamedMap.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSNamedMap.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSNamedMap.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(XSNAMEDMAP_HPP)
-#define XSNAMEDMAP_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSNAMEDMAP_HPP)
+#define XERCESC_INCLUDE_GUARD_XSNAMEDMAP_HPP
 
 
 #include <xercesc/util/XMemory.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSNamespaceItem.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSNamespaceItem.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSNamespaceItem.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSNamespaceItem.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSNAMESPACEITEM_HPP)
-#define XSNAMESPACEITEM_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSNAMESPACEITEM_HPP)
+#define XERCESC_INCLUDE_GUARD_XSNAMESPACEITEM_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/framework/psvi/XSObject.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSNotationDeclaration.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSNotationDeclaration.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSNotationDeclaration.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSNotationDeclaration.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSNOTATIONDECLARATION_HPP)
-#define XSNOTATIONDECLARATION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSNOTATIONDECLARATION_HPP)
+#define XERCESC_INCLUDE_GUARD_XSNOTATIONDECLARATION_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSObject.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSObject.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSObject.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSObject.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSOBJECT_HPP)
-#define XSOBJECT_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSOBJECT_HPP)
+#define XERCESC_INCLUDE_GUARD_XSOBJECT_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/framework/psvi/XSConstants.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSParticle.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSParticle.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSParticle.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSParticle.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSPARTICLE_HPP)
-#define XSPARTICLE_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSPARTICLE_HPP)
+#define XERCESC_INCLUDE_GUARD_XSPARTICLE_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSSimpleTypeDefinition.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSSimpleTypeDefinition.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSSimpleTypeDefinition.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSSimpleTypeDefinition.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSSIMPLETYPEDEFINITION_HPP)
-#define XSSIMPLETYPEDEFINITION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSSIMPLETYPEDEFINITION_HPP)
+#define XERCESC_INCLUDE_GUARD_XSSIMPLETYPEDEFINITION_HPP
 
 #include <xercesc/framework/psvi/XSTypeDefinition.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSTypeDefinition.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSTypeDefinition.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSTypeDefinition.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSTypeDefinition.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSTYPEDEFINITION_HPP)
-#define XSTYPEDEFINITION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSTYPEDEFINITION_HPP)
+#define XERCESC_INCLUDE_GUARD_XSTYPEDEFINITION_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSValue.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSValue.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSValue.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSValue.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSVALUE_HPP)
-#define XSVALUE_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSVALUE_HPP)
+#define XERCESC_INCLUDE_GUARD_XSVALUE_HPP
 
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/ValueHashTableOf.hpp>

Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSWildcard.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSWildcard.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSWildcard.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSWildcard.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XSWILDCARD_HPP)
-#define XSWILDCARD_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XSWILDCARD_HPP)
+#define XERCESC_INCLUDE_GUARD_XSWILDCARD_HPP
 
 #include <xercesc/framework/psvi/XSObject.hpp>
 

Modified: xerces/c/trunk/src/xercesc/internal/BinFileOutputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/BinFileOutputStream.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/BinFileOutputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/BinFileOutputStream.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(BINFILEOUTPUTSTREAM_HPP)
-#define BINFILEOUTPUTSTREAM_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_BINFILEOUTPUTSTREAM_HPP)
+#define XERCESC_INCLUDE_GUARD_BINFILEOUTPUTSTREAM_HPP
 
 #include <xercesc/framework/BinOutputStream.hpp>
 #include <xercesc/util/PlatformUtils.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/BinMemOutputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/BinMemOutputStream.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/BinMemOutputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/BinMemOutputStream.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#ifndef BINMEMOUTPUTSTREAM_HEADER_GUARD_
-#define BINMEMOUTPUTSTREAM_HEADER_GUARD_
+#if !defined(XERCESC_INCLUDE_GUARD_BINMEMOUTPUTSTREAM_HPP)
+#define XERCESC_INCLUDE_GUARD_BINMEMOUTPUTSTREAM_HPP
 
 #include <xercesc/framework/BinOutputStream.hpp>
 #include <xercesc/util/PlatformUtils.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/CharTypeTables.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/CharTypeTables.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/CharTypeTables.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/CharTypeTables.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(CHARTYPETABLES_HPP)
-#define CHARTYPETABLES_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_CHARTYPETABLES_HPP)
+#define XERCESC_INCLUDE_GUARD_CHARTYPETABLES_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 

Modified: xerces/c/trunk/src/xercesc/internal/DGXMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/DGXMLScanner.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/DGXMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/DGXMLScanner.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(DGXMLSCANNER_HPP)
-#define DGXMLSCANNER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_DGXMLSCANNER_HPP)
+#define XERCESC_INCLUDE_GUARD_DGXMLSCANNER_HPP
 
 #include <xercesc/internal/XMLScanner.hpp>
 #include <xercesc/util/ValueVectorOf.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/ElemStack.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/ElemStack.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/ElemStack.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/ElemStack.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(ELEMSTACK_HPP)
-#define ELEMSTACK_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_ELEMSTACK_HPP)
+#define XERCESC_INCLUDE_GUARD_ELEMSTACK_HPP
 
 #include <xercesc/util/StringPool.hpp>
 #include <xercesc/util/QName.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/EndOfEntityException.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/EndOfEntityException.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/EndOfEntityException.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/EndOfEntityException.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(ENDOFENTITYEXCEPTION_HPP)
-#define ENDOFENTITYEXCEPTION_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_ENDOFENTITYEXCEPTION_HPP)
+#define XERCESC_INCLUDE_GUARD_ENDOFENTITYEXCEPTION_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 

Modified: xerces/c/trunk/src/xercesc/internal/IANAEncodings.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/IANAEncodings.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IANAEncodings.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IANAEncodings.hpp Tue Apr 10 07:56:39 2007
@@ -1,5 +1,26 @@
-#if !defined(IANAENCODINGS_HPP)
-#define IANAENCODINGS_HPP
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * $Id$
+ */
+
+#if !defined(XERCESC_INCLUDE_GUARD_IANAENCODINGS_HPP)
+#define XERCESC_INCLUDE_GUARD_IANAENCODINGS_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 

Modified: xerces/c/trunk/src/xercesc/internal/IGXMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/IGXMLScanner.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(IGXMLSCANNER_HPP)
-#define IGXMLSCANNER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_IGXMLSCANNER_HPP)
+#define XERCESC_INCLUDE_GUARD_IGXMLSCANNER_HPP
 
 #include <xercesc/internal/XMLScanner.hpp>
 #include <xercesc/util/KVStringPair.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/MemoryManagerArrayImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/MemoryManagerArrayImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/MemoryManagerArrayImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/MemoryManagerArrayImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(MEMORYMANAGERARRAYIMPL_HPP)
-#define MEMORYMANAGERARRAYIMPL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_MEMORYMANAGERARRAYIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_MEMORYMANAGERARRAYIMPL_HPP
 
 #include <xercesc/framework/MemoryManager.hpp>
 

Modified: xerces/c/trunk/src/xercesc/internal/MemoryManagerImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/MemoryManagerImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/MemoryManagerImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/MemoryManagerImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(MEMORYMANAGERIMPL_HPP)
-#define MEMORYMANAGERIMPL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_MEMORYMANAGERIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_MEMORYMANAGERIMPL_HPP
 
 #include <xercesc/framework/MemoryManager.hpp>
 

Modified: xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(READERMGR_HPP)
-#define READERMGR_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_READERMGR_HPP)
+#define XERCESC_INCLUDE_GUARD_READERMGR_HPP
 
 #include <xercesc/internal/XMLReader.hpp>
 #include <xercesc/util/PlatformUtils.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(SGXMLSCANNER_HPP)
-#define SGXMLSCANNER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_SGXMLSCANNER_HPP)
+#define XERCESC_INCLUDE_GUARD_SGXMLSCANNER_HPP
 
 #include <xercesc/internal/XMLScanner.hpp>
 #include <xercesc/util/KVStringPair.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/ValidationContextImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/ValidationContextImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/ValidationContextImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/ValidationContextImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(VALIDATION_CONTEXTIMPL_HPP)
-#define VALIDATION_CONTEXTIMPL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_VALIDATION_CONTEXTIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_VALIDATION_CONTEXTIMPL_HPP
 
 #include <xercesc/framework/ValidationContext.hpp>
 

Modified: xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(VECATTRLISTIMPL_HPP)
-#define VECATTRLISTIMPL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_VECATTRLISTIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_VECATTRLISTIMPL_HPP
 
 #include <xercesc/sax/AttributeList.hpp>
 #include <xercesc/framework/XMLAttr.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/VecAttributesImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/VecAttributesImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/VecAttributesImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/VecAttributesImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(VECATTRIBUTESIMPL_HPP)
-#define VECATTRIBUTESIMPL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_VECATTRIBUTESIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_VECATTRIBUTESIMPL_HPP
 
 #include <xercesc/sax2/Attributes.hpp>
 #include <xercesc/framework/XMLAttr.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/WFXMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/WFXMLScanner.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/WFXMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/WFXMLScanner.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(WFXMLSCANNER_HPP)
-#define WFXMLSCANNER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_WFXMLSCANNER_HPP)
+#define XERCESC_INCLUDE_GUARD_WFXMLSCANNER_HPP
 
 #include <xercesc/internal/XMLScanner.hpp>
 #include <xercesc/util/ValueHashTableOf.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLGrammarPoolImplIMPL_HPP)
-#define XMLGrammarPoolImplIMPL_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLGRAMMARPOOLIMPL_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLGRAMMARPOOLIMPL_HPP
 
 #include <xercesc/framework/XMLGrammarPool.hpp>
 

Modified: xerces/c/trunk/src/xercesc/internal/XMLInternalErrorHandler.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLInternalErrorHandler.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLInternalErrorHandler.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLInternalErrorHandler.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLINTERNALERRORHANDLER_HPP)
-#define XMLINTERNALERRORHANDLER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLINTERNALERRORHANDLER_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLINTERNALERRORHANDLER_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/sax/ErrorHandler.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/XMLReader.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLReader.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLReader.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLReader.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLREADER_HPP)
-#define XMLREADER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLREADER_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLREADER_HPP
 
 #include <xercesc/util/XMLChar.hpp>
 #include <xercesc/framework/XMLRecognizer.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp Tue Apr 10 07:56:39 2007
@@ -19,9 +19,8 @@
  * $Id$
  */
 
-
-#if !defined(XMLSCANNER_HPP)
-#define XMLSCANNER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLSCANNER_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLSCANNER_HPP
 
 #include <xercesc/framework/XMLBufferMgr.hpp>
 #include <xercesc/framework/XMLErrorCodes.hpp>

Modified: xerces/c/trunk/src/xercesc/internal/XMLScannerResolver.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLScannerResolver.hpp?view=diff&rev=527149&r1=527148&r2=527149
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLScannerResolver.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLScannerResolver.hpp Tue Apr 10 07:56:39 2007
@@ -19,8 +19,8 @@
  * $Id$
  */
 
-#if !defined(XMLSCANNERRESOLVER_HPP)
-#define XMLSCANNERRESOLVER_HPP
+#if !defined(XERCESC_INCLUDE_GUARD_XMLSCANNERRESOLVER_HPP)
+#define XERCESC_INCLUDE_GUARD_XMLSCANNERRESOLVER_HPP
 
 #include <xercesc/internal/XMLScanner.hpp>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org