[Mockpp-commits] mockpp/mockpp Makefile.am,1.106,1.107 mockpp.h,1.70,1.71
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2005-12-30 12:43:25
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14099/mockpp Modified Files: Makefile.am mockpp.h Log Message: fix msvc2005 Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- mockpp.h 29 Dec 2005 19:29:50 -0000 1.70 +++ mockpp.h 30 Dec 2005 12:43:17 -0000 1.71 @@ -103,9 +103,8 @@ # endif // _MSC_VER -// msvc60 is 1200? -// msvc70 is 1300 -// msvc71 is 1310 +// msvc71 is 1310 +// msvc2005 is 1400 #ifdef _MSC_VER # include <mockpp/mockpp_config-msvc_71.h> Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- Makefile.am 29 Dec 2005 08:04:40 -0000 1.106 +++ Makefile.am 30 Dec 2005 12:43:17 -0000 1.107 @@ -118,7 +118,9 @@ TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@ echo "" >>$@ echo "/* Define to use sprintf_s instead of sprintf. */" >>$@ - echo "#define HAVE_SPRINTF_S" >>$@ + echo "#if _MSC_VER >= 1400" >>$@ + echo "# define HAVE_SPRINTF_S" >>$@ + echo "#endif" >>$@ echo "" >>$@ $(SHELL) $(srcdir)/config/gen-config-common.sh $@ $(VERSION) $(PACKAGE) -test $@ -ef $(srcdir) || cp $@ $(srcdir) |