tng 2002/11/18 12:38:11
Modified: c/src/xercesc/util/Compilers GCCDefs.cpp GCCDefs.hpp
Log:
[Bug 14612] GCCDefs clashes with cygwin's string.h for stricmp and strnicmp.
Revision Changes Path
1.2 +7 -1 xml-xerces/c/src/xercesc/util/Compilers/GCCDefs.cpp
Index: GCCDefs.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/GCCDefs.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GCCDefs.cpp 1 Feb 2002 22:22:18 -0000 1.1
+++ GCCDefs.cpp 18 Nov 2002 20:38:11 -0000 1.2
@@ -57,8 +57,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:18 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/18 20:38:11 tng
+ * [Bug 14612] GCCDefs clashes with cygwin's string.h for stricmp and strnicmp.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:18 peiyongz
+ * sane_include
*
* Revision 1.4 2000/07/29 05:41:00 jberry
* Fixups for Mac OS
@@ -79,7 +82,6 @@
*
*/
-
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
@@ -88,6 +90,8 @@
#include <string.h>
+#ifndef __CYGWIN__
+
int stricmp(const char* const str1, const char* const str2)
{
return strcasecmp(str1, str2);
@@ -100,3 +104,5 @@
return strncasecmp( str1, str2, (size_t)count);
}
+
+#endif // ! __CYGWIN__
1.6 +6 -0 xml-xerces/c/src/xercesc/util/Compilers/GCCDefs.hpp
Index: GCCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/GCCDefs.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GCCDefs.hpp 4 Nov 2002 14:45:20 -0000 1.5
+++ GCCDefs.hpp 18 Nov 2002 20:38:11 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/18 20:38:11 tng
+ * [Bug 14612] GCCDefs clashes with cygwin's string.h for stricmp and strnicmp.
+ *
* Revision 1.5 2002/11/04 14:45:20 tng
* C++ Namespace Support.
*
@@ -214,9 +217,12 @@
}
#endif
+#ifndef __CYGWIN__
+
int stricmp(const char* const str1, const char* const str2);
int strnicmp(const char* const str1, const char* const str2, const unsigned int
count);
+#endif // ! __CYGWIN__
// ---------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
