[Mockpp-commits] mockpp/mockpp .cvsignore,1.9,1.10 Makefile.am,1.72,1.73 mockpp.h,1.43,1.44

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9976/mockpp

Modified Files:
	.cvsignore Makefile.am mockpp.h 
Log Message:
integrated patches for msvc 7.1

Index: mockpp.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- mockpp.h	20 Mar 2005 15:09:04 -0000	1.43
+++ mockpp.h	22 Mar 2005 22:03:21 -0000	1.44
@@ -93,18 +93,20 @@
 #  pragma warning (disable:4100)
 # endif // _MSC_VER
 
-#ifdef _MSC_VER
-# include <mockpp/mockpp_config-msvc.h>
+#if defined(_MSC_VER) && (_MSC_VER < 1400)
+# include <mockpp/mockpp_config-msvc_60_70.h>
+#elif defined(_MSC_VER)
+# include <mockpp/mockpp_config-msvc_71.h>
 #elif defined(__BORLANDC__)
 # include <mockpp/mockpp_config-bcb5.h>
 #elif defined(__CYGWIN__)
 # include <mockpp/mockpp_config-cygwin.h>
 #else
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#else
-# include <mockpp/mockpp_config.h>
-#endif
+# ifdef HAVE_CONFIG_H
+#  include <config.h>
+# else
+#  include <mockpp/mockpp_config.h>
+# endif
 #endif
 
 #include <string>

Index: .cvsignore
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- .cvsignore	2 Oct 2004 11:02:26 -0000	1.9
+++ .cvsignore	22 Mar 2005 22:03:21 -0000	1.10
@@ -4,6 +4,8 @@
 mockpp_config-bcb5.h
 mockpp_config-cygwin.h
 mockpp_config-msvc.h
+mockpp_config-msvc_71.h
+mockpp_config-msvc_60_70.h
 lint-bcb
 *.directory
 Makefile

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- Makefile.am	16 Mar 2005 20:23:38 -0000	1.72
+++ Makefile.am	22 Mar 2005 22:03:21 -0000	1.73
@@ -29,7 +29,8 @@
 
 EXTRA_DIST = \
    mockpp_config-bcb5.h \
-   mockpp_config-msvc.h \
+   mockpp_config-msvc_60_70.h \
+   mockpp_config-msvc_71.h \
    mockpp_config-cygwin.h \
    visitable-template.h \
    visitable-template.raw \
@@ -183,7 +184,44 @@
 	echo "" >>$@
 	-test $@ -ef $(srcdir) || cp $@ $(srcdir)
 
-mockpp_config-msvc.h:
+mockpp_config-msvc_71.h:
+	echo "// #define's for MS Visual C++ 7.1 (NOT 6.0/7.0)" >$@
+	echo "// derived from automatically generated config.h. See Makefile.am." >>$@
+	TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@
+	echo "" >>$@
+	echo "/* Define to turn debugging globally on. */" >>$@
+	echo "#undef DEBUG" >>$@
+	echo "" >>$@
+	echo "/* Version number of package */" >>$@
+	echo "#define MOCKPP_VERSION \"$(VERSION)\"" >>$@
+	echo "" >>$@
+	echo "/* Name of package */" >>$@
+	echo "#define MOCKPP_PACKAGE \"$(PACKAGE)\"" >>$@
+	echo "" >>$@
+	echo "/* Define if you have CppUnit installed. */" >>$@
+	echo "#define HAVE_CPPUNIT" >>$@
+	echo "" >>$@
+	echo "/* Define to 1 if you have the <limits> header file. */" >>$@
+	echo "#define HAVE_LIMITS 1" >>$@
+	echo "" >>$@
+	echo "/* Define to 1 if you have the <cppunit/Message.h> header file. */" >>$@
+	echo "#define HAVE_CPPUNIT_MESSAGE_H 1" >>$@
+	echo "" >>$@
+	echo "/* Define to compile for unicode environment. */" >>$@
+	echo "#undef MOCKPP_UNICODE" >>$@
+	echo "" >>$@
+	echo "/* Define if you have the cwchar header. */" >>$@
+	echo "#define HAVE_CWCHAR" >>$@
+	echo "" >>$@
+	echo "/* Define if you have the std::wstring type. */" >>$@
+	echo "#define HAVE_WSTRING" >>$@
+	echo "" >>$@
+	echo "/* Define if you have the std::wcscmp type. */" >>$@
+	echo "#define HAVE_WCSCMP" >>$@
+	echo "" >>$@
+	-test $@ -ef $(srcdir) || cp $@ $(srcdir)
+
+mockpp_config-msvc_60_70.h:
 	echo "// #define's for MS Visual C++ (only V6?)" >$@
 	echo "// derived from automatically generated config.h. See Makefile.am." >>$@
 	TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@