From a324b3ce52de6c37d69957aa55a3eb1002904e94 Mon Sep 17 00:00:00 2001
From: PeiYong Zhang <peiyongz@apache.org>
Date: Tue, 2 Apr 2002 20:17:47 +0000
Subject: [PATCH] Bug# 7555: Enable AIX build with newer xlC versions, patch
from Martin Kalen (martin.kalen@todaysystems.com.au )
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@173608 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/util/Compilers/CSetDefs.cpp | 23 +++++++++++++----------
src/xercesc/util/Compilers/Makefile.in | 2 +-
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/xercesc/util/Compilers/CSetDefs.cpp b/src/xercesc/util/Compilers/CSetDefs.cpp
index 4d032466d..dcc9fcf17 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 30dfeee14..01de4cef5 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++)
--
GitLab