diff --git a/src/xercesc/util/Compilers/CSetDefs.cpp b/src/xercesc/util/Compilers/CSetDefs.cpp
index 4d032466db0f63ffd5abf5af9ee6708cbcd66aa3..dcc9fcf17991533225d92bd2903914d67e7a1d5b 100644
--- a/src/xercesc/util/Compilers/CSetDefs.cpp
+++ b/src/xercesc/util/Compilers/CSetDefs.cpp
@@ -56,8 +56,12 @@
 
 /*
  * $Log$
- * Revision 1.1  2002/02/01 22:22:18  peiyongz
- * Initial revision
+ * Revision 1.2  2002/04/02 20:17:47  peiyongz
+ * Bug# 7555: Enable AIX build with newer xlC versions,
+ * patch from Martin Kalen (martin.kalen@todaysystems.com.au )
+ *
+ * Revision 1.1.1.1  2002/02/01 22:22:18  peiyongz
+ * sane_include
  *
  * Revision 1.3  2000/03/02 19:55:07  roddey
  * This checkin includes many changes done while waiting for the
@@ -79,7 +83,7 @@
 // ---------------------------------------------------------------------------
 //  Includes
 // ---------------------------------------------------------------------------
-#if defined (XML_IBMVAW32) || (XML_IBMVAOS2)
+#if defined(XML_IBMVAW32) || defined(XML_IBMVAOS2)
 
 #include <string.h>
 
@@ -88,17 +92,16 @@
 #include <xercesc/util/Compilers/CSetDefs.hpp>
 #include <strings.h>
 
-
-int stricmp(const char* const str1, const char* const  str2) 
+int stricmp(const char* const str1, const char* const str2) 
 {
-        return strcasecmp(str1, str2);
+	return strcasecmp(str1, str2);
 }
 
-int strnicmp(const char* const str1, const char* const  str2, const unsigned int count)
+int strnicmp(const char* const str1, const char* const str2, const unsigned int count)
 {
-        if (count == 0)
-                return 0;
+	if (count == 0)
+		return 0;
 
-        return strncasecmp( str1, str2, (size_t)count);
+	return strncasecmp( str1, str2, (size_t)count);
 }
 #endif
diff --git a/src/xercesc/util/Compilers/Makefile.in b/src/xercesc/util/Compilers/Makefile.in
index 30dfeee14f5db8c0bf2443a4c9ed019a853f314a..01de4cef5b15279f0d1f1dfd81144356e42806cf 100644
--- a/src/xercesc/util/Compilers/Makefile.in
+++ b/src/xercesc/util/Compilers/Makefile.in
@@ -110,7 +110,7 @@ ifeq (${CXX},CC)
         CPP_OBJECTS = SCOCCDefs.$(TO)
     endif
 endif
-ifeq (xlC_r,$(findstring xlC_r,${CXX}))
+ifeq (xlC,$(findstring xlC,${CXX}))
     CPP_OBJECTS = CSetDefs.$(TO)
 endif
 ifeq (${CXX},g++)