Documentation tweaks. Add config-mac.h

3 files changed, 61 insertions, 7 deletions

diff --git a/include/cppunit/Portability.h b/include/cppunit/Portability.h
index d4a0652..52d26bc 100644
--- a/include/cppunit/Portability.h
+++ b/include/cppunit/Portability.h
@@ -42,8 +42,6 @@
 /* Define CPPUNIT_SSTREAM as a stream with a "std::string str()"
  * method.
  */
-#include <string>
-
 #if CPPUNIT_HAVE_SSTREAM
 #   include <sstream>
     namespace CppUnit {
@@ -51,11 +49,13 @@
     }
 #else 
 #if CPPUNIT_HAVE_CLASS_STRSTREAM
+#   include <string>
 #   if CPPUNIT_HAVE_STRSTREAM
 #       include <strstream>
 #   else
 #       include <strstream.h>
 #   endif
+
     namespace CppUnit {
 	class OStringStream : public std::ostrstream 
 	{
diff --git a/include/cppunit/config-mac.h b/include/cppunit/config-mac.h
new file mode 100644
index 0000000..990163a
--- /dev/null
+++ b/include/cppunit/config-mac.h
@@ -0,0 +1,59 @@
+#ifndef _INCLUDE_CPPUNIT_CONFIG_MAC_H
+#define _INCLUDE_CPPUNIT_CONFIG_MAC_H 1
+
+/* MacOS X should be installed using the configure script.
+   This file is for other macs.
+
+   It is not integrated into <cppunit/Portability.h> because we don't
+   know a suitable preprocessor symbol that will distinguish MacOS X
+   from other MacOS versions.  Email us if you know the answer.
+*/
+
+ 
+/* define if library uses std::string::compare(string,pos,n) */
+#ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 
+#undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
+#endif
+
+/* define if the library defines strstream */
+#ifndef CPPUNIT_HAVE_CLASS_STRSTREAM 
+#define CPPUNIT_HAVE_CLASS_STRSTREAM  1 
+#endif
+
+/* Define if you have the <cmath> header file. */
+#ifdef CPPUNIT_HAVE_CMATH 
+#undef CPPUNIT_HAVE_CMATH
+#endif
+
+/* Define if you have the <dlfcn.h> header file. */
+#ifdef CPPUNIT_HAVE_DLFCN_H 
+#undef CPPUNIT_HAVE_DLFCN_H
+#endif
+
+/* define to 1 if the compiler implements namespaces */
+#ifndef CPPUNIT_HAVE_NAMESPACES 
+#define CPPUNIT_HAVE_NAMESPACES  1 
+#endif
+
+/* define if the compiler supports Run-Time Type Identification */
+#ifndef CPPUNIT_HAVE_RTTI 
+#define CPPUNIT_HAVE_RTTI  1 
+#endif
+
+/* define if the compiler has stringstream */
+#ifndef CPPUNIT_HAVE_SSTREAM 
+#define CPPUNIT_HAVE_SSTREAM  1 
+#endif
+
+/* Define if you have the <strstream> header file. */
+#ifndef CPPUNIT_HAVE_STRSTREAM 
+#define CPPUNIT_HAVE_STRSTREAM  1 
+#endif
+
+/* Define to 1 to use type_info::name() for class names */
+#ifndef CPPUNIT_USE_TYPEINFO_NAME 
+#define CPPUNIT_USE_TYPEINFO_NAME  CPPUNIT_HAVE_RTTI 
+#endif
+
+/* _INCLUDE_CPPUNIT_CONFIG_MAC_H */
+#endif
diff --git a/include/cppunit/config-msvc6.h b/include/cppunit/config-msvc6.h
index 00b6037..0eac74e 100644
--- a/include/cppunit/config-msvc6.h
+++ b/include/cppunit/config-msvc6.h
@@ -38,11 +38,6 @@
 #define CPPUNIT_PACKAGE  "cppunit" 
 #endif
 
-/* Version number of package */
-#ifndef CPPUNIT_VERSION 
-#define CPPUNIT_VERSION  "1.5.5" 
-#endif
-
 
 
 #if _MSC_VER > 1000     // VC++