[Mockpp-commits] mockpp/mockpp Makefile.am,1.74,1.75 mockpp.h,1.48,1.49
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp Makefile.am,1.74,1.75 mockpp.h,1.48,1.49
|
From: Ewald A. <ewa...@us...> - 2005-04-02 13:47:27
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31668/mockpp Modified Files: Makefile.am mockpp.h Log Message: fixes for cygwin (unicode+ascii) Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- mockpp.h 25 Mar 2005 18:46:56 -0000 1.48 +++ mockpp.h 2 Apr 2005 13:46:28 -0000 1.49 @@ -84,36 +84,41 @@ #include <typeinfo> # ifdef _MSC_VER -// Compilation Warning remover +// Compilation Warning remover // needed to prevent MSVC6 complain about itself :-/ # pragma warning (disable:4786) // this warning occurs when VC6 truncate a debug symbol which is longer than 255 chars. # pragma warning (disable:4251) // this warning occurs when a class member doesn't have a dll-interface. # pragma warning (disable:4180) # pragma warning (disable:4355) -# pragma warning (disable:4512) -# pragma warning (disable:4511) -# pragma warning (disable:4018) -# pragma warning (disable:4100) -# pragma warning (disable:4663) -# pragma warning (disable:4146) -# pragma warning (disable:4244) +# pragma warning (disable:4512) +# pragma warning (disable:4511) +# pragma warning (disable:4018) +# pragma warning (disable:4100) +# pragma warning (disable:4663) +# pragma warning (disable:4146) +# pragma warning (disable:4244) # endif // _MSC_VER - - + + #if defined(_MSC_VER) -# if _MSC_VER <= 1200 -# define _MSC_VER_60_70 1 +# if _MSC_VER <= 1200 +# define _MSC_VER_60_70 1 # include <mockpp/mockpp_config-msvc_60_70.h> -# else defined(_MSC_VER) -# include <mockpp/mockpp_config-msvc_71.h> +# else defined(_MSC_VER) +# include <mockpp/mockpp_config-msvc_71.h> # endif - + #elif defined(__BORLANDC__) # include <mockpp/mockpp_config-bcb5.h> - + #elif defined(__CYGWIN__) -# include <mockpp/mockpp_config-cygwin.h> - +# ifdef HAVE_CONFIG_H +# include <config.h> +# else +# include <mockpp/mockpp_config.h> +//# include <mockpp/mockpp_config-cygwin.h> +# endif + #else # ifdef HAVE_CONFIG_H # include <config.h> @@ -122,9 +127,24 @@ # endif #endif +#if defined(MOCKPP_UNICODE) +# ifndef _UNICODE +# define _UNICODE +# endif +# ifndef UNICODE +# define UNICODE +# endif +#endif + +#if defined(MOCKPP_UNICODE) && defined(__CYGWIN__) // probably ugly hack +# define _GLIBCPP_USE_WSTRING 1 +//# define _GLIBCPP_USE_WCHAR_T 1 +//# define _GLIBCPP_HAVE_WCHAR_H +#endif + #include <string> -#ifdef HAVE_LIMITS +#ifdef HAVE_LIMITS # include <limits> // current #else # ifdef HAVE_VALUES_H @@ -134,20 +154,20 @@ # endif #endif -/** @def MOCKPP_UNLIMITED - * Value representing an @p unlimited number. - */ - +/** @def MOCKPP_UNLIMITED + * Value representing an @p unlimited number. + */ + #ifdef HAVE_LIMITS # define MOCKPP_UNLIMITED (std::numeric_limits<unsigned>::max()) #else # define MOCKPP_UNLIMITED (UINT_MAX) #endif - + #ifdef __BORLANDC__ # define MOCKPP_FUNC_MACRO __FUNC__ #elif defined(_MSC_VER) -# if _MSC_VER <= 1200 +# if _MSC_VER <= 1200 # define MOCKPP_FUNC_MACRO (std::string(__FILE__) + "_" + mockpp::getLatin1(mockpp::number((long unsigned)__LINE__))) // needs #include <mockpp/compat/Formatter.h> # else # define MOCKPP_FUNC_MACRO __FUNCSIG__ Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- Makefile.am 24 Mar 2005 21:43:06 -0000 1.74 +++ Makefile.am 2 Apr 2005 13:46:27 -0000 1.75 @@ -142,9 +142,12 @@ 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 if you have the wcscmp function. */" >>$@ echo "#define HAVE_WCSCMP" >>$@ echo "" >>$@ + echo "/* Define if you have the std::wcscmp function. */" >>$@ + echo "#define HAVE_STD_WCSCMP" >>$@ + echo "" >>$@ echo "/* Define to supress compiler warnings about unused variables. */" >>$@ echo "#define MOCKPP_UNUSED(x) x" >>$@ echo "" >>$@ @@ -182,8 +185,11 @@ echo "/* Define if you have the std::wstring type. */" >>$@ echo "#define HAVE_WSTRING" >>$@ echo "" >>$@ - echo "/* Define if you have the std::wcscmp type. */" >>$@ - echo "#undef HAVE_WCSCMP" >>$@ + echo "/* Define if you have the wcscmp function. */" >>$@ + echo "#define HAVE_WCSCMP" >>$@ + echo "" >>$@ + echo "/* Define if you have the std::wcscmp function. */" >>$@ + echo "#undef HAVE_STD_WCSCMP" >>$@ echo "" >>$@ -test $@ -ef $(srcdir) || cp $@ $(srcdir) @@ -219,9 +225,12 @@ 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 if you have the wcscmp function. */" >>$@ echo "#define HAVE_WCSCMP" >>$@ echo "" >>$@ + echo "/* Define if you have the std::wcscmp function. */" >>$@ + echo "#define HAVE_STD_WCSCMP" >>$@ + echo "" >>$@ echo "/* Define to supress compiler warnings about unused variables. */" >>$@ echo "#define MOCKPP_UNUSED(x) x" >>$@ echo "" >>$@ @@ -262,9 +271,12 @@ 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 if you have the wcscmp function. */" >>$@ echo "#define HAVE_WCSCMP" >>$@ echo "" >>$@ + echo "/* Define if you have the std::wcscmp function. */" >>$@ + echo "#undef HAVE_STD_WCSCMP" >>$@ + echo "" >>$@ echo "/* Define to supress compiler warnings about unused variables. */" >>$@ echo "#define MOCKPP_UNUSED(x) x" >>$@ echo "" >>$@ |
