diff --git a/Makefile.in b/Makefile.in
index 7fcebbe..65b025d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -121,10 +121,12 @@ distclean:	clean
 # Run the clang.llvm.org static code analysis tool on the C sources.
 #
 
-.PHONY: clang
+.PHONY: clang clang-changes
 clang:
 	$(RM) -r clang
-	scan-build -k -V -o `pwd`/clang $(MAKE) $(MFLAGS) CC=ccc-analyzer clean all
+	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) clean all
+clang-changes:
+	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) all
 
 
 #
diff --git a/doc/reference.html b/doc/reference.html
index 83aa85e..7517f48 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -196,7 +196,7 @@ using a SAX callback.">mxmlSAXLoadString</a></li>
 <li><a href="#mxmlSetReal" title="Set the value of a real number node.">mxmlSetReal</a></li>
 <li><a href="#mxmlSetText" title="Set the value of a text node.">mxmlSetText</a></li>
 <li><a href="#mxmlSetTextf" title="Set the value of a text node to a formatted string.">mxmlSetTextf</a></li>
-<li><a href="#mxmlSetWrapMargin" title="Set the the wrap margin when saving XML data.">mxmlSetWrapMargin</a></li>
+<li><a href="#mxmlSetWrapMargin" title="Set the wrap margin when saving XML data.">mxmlSetWrapMargin</a></li>
 <li><a href="#mxmlWalkNext" title="Walk to the next logical node in the tree.">mxmlWalkNext</a></li>
 <li><a href="#mxmlWalkPrev" title="Walk to the previous logical node in the tree.">mxmlWalkPrev</a></li>
 </ul></li>
@@ -1309,7 +1309,7 @@ int mxmlSetTextf (<br>
 <h4 class="discussion">Discussion</h4>
 <p class="discussion">The node is not changed if it is not a text node.</p>
 <h3 class="function"><span class="info">&nbsp;Mini-XML 2.3&nbsp;</span><a name="mxmlSetWrapMargin">mxmlSetWrapMargin</a></h3>
-<p class="description">Set the the wrap margin when saving XML data.</p>
+<p class="description">Set the wrap margin when saving XML data.</p>
 <p class="code">
 void mxmlSetWrapMargin (<br>
 &nbsp;&nbsp;&nbsp;&nbsp;int column<br>
diff --git a/mxml-private.c b/mxml-private.c
index e215bff..48e7581 100644
--- a/mxml-private.c
+++ b/mxml-private.c
@@ -49,7 +49,7 @@
 #elif defined(__hpux)
 #  pragma FINI _mxml_fini
 #  define _MXML_FINI _mxml_fini
-#elif defined(__GCC__) /* Linux and Mac OS X */
+#elif defined(__GNUC__) /* Linux and Mac OS X */
 #  define _MXML_FINI __attribute((destructor)) _mxml_fini
 #else
 #  define _MXML_FINI _fini
diff --git a/mxml.xml b/mxml.xml
index a17bbb1..6340c5b 100644
--- a/mxml.xml
+++ b/mxml.xml
@@ -1029,7 +1029,7 @@ The node is not changed if it is not a text node.</description>
     </argument>
   </function>
   <function name="mxmlSetWrapMargin">
-    <description>Set the the wrap margin when saving XML data.
+    <description>Set the wrap margin when saving XML data.
 
 Wrapping is disabled when &quot;column&quot; is 0.