From 11443a7c03bc230a774b23d34f95441fecaa6993 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Thu, 3 Mar 2011 20:14:41 +0000 Subject: [PATCH] Enabled CFormat "%m" for MSVC10 (neat feature) --- .svn-revision | 2 +- docs/Changelog | 1 + .../libs/libmulecommon/libmulecommon.vcxproj | 18 ++++++----- .../libmulecommon/libmulecommon.vcxproj.filters | 36 +++++++++++++--------- platforms/Windows/MSVC10/makeconfig.cmd | 1 + src/libs/common/strerror_r.c | 3 +- 6 files changed, 36 insertions(+), 25 deletions(-) diff --git a/.svn-revision b/.svn-revision index b7296bb7..e3754750 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -10462 +10463 diff --git a/docs/Changelog b/docs/Changelog index 9ae1b9de..f9c81413 100644 --- a/docs/Changelog +++ b/docs/Changelog @@ -28,6 +28,7 @@ Version 2.3.0 - The river knows. UTF-8 byte count to determine whether the keyword is allowed or not. * Use actual page size in mmap calls instead of a randomly selected number. + * Improved CFormat and enabled reordering of arguments for translators Greek: * Part number is now an extra column in the download list diff --git a/platforms/Windows/MSVC10/libs/libmulecommon/libmulecommon.vcxproj b/platforms/Windows/MSVC10/libs/libmulecommon/libmulecommon.vcxproj index f4bc051f..e700a588 100644 --- a/platforms/Windows/MSVC10/libs/libmulecommon/libmulecommon.vcxproj +++ b/platforms/Windows/MSVC10/libs/libmulecommon/libmulecommon.vcxproj @@ -73,8 +73,8 @@ /MP %(AdditionalOptions) Disabled - $(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;%(AdditionalIncludeDirectories) - _DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories) + _DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) Async EnableFastChecks MultiThreadedDebugDLL @@ -88,8 +88,8 @@ /MP %(AdditionalOptions) Full - $(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;%(AdditionalIncludeDirectories) - _LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories) + _LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreaded @@ -101,8 +101,8 @@ /MP %(AdditionalOptions) Disabled - $(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;%(AdditionalIncludeDirectories) - _DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories) + _DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) Async EnableFastChecks MultiThreadedDebugDLL @@ -116,8 +116,8 @@ /MP %(AdditionalOptions) Full - $(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;%(AdditionalIncludeDirectories) - _LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories) + _LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreaded @@ -131,6 +131,7 @@ + @@ -158,6 +159,7 @@ + diff --git a/platforms/Windows/MSVC10/libs/libmulecommon/libmulecommon.vcxproj.filters b/platforms/Windows/MSVC10/libs/libmulecommon/libmulecommon.vcxproj.filters index e83bcee0..51c2d383 100644 --- a/platforms/Windows/MSVC10/libs/libmulecommon/libmulecommon.vcxproj.filters +++ b/platforms/Windows/MSVC10/libs/libmulecommon/libmulecommon.vcxproj.filters @@ -15,53 +15,59 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + + Source Files + + Source Files - + + Header Files + + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/platforms/Windows/MSVC10/makeconfig.cmd b/platforms/Windows/MSVC10/makeconfig.cmd index 070b9134..f4d4ab8d 100644 --- a/platforms/Windows/MSVC10/makeconfig.cmd +++ b/platforms/Windows/MSVC10/makeconfig.cmd @@ -29,4 +29,5 @@ echo #include ^ >>config.h :finish echo #define CRYPTOPP_INCLUDE_PREFIX ../cryptopp>>config.h echo #define PACKAGE "amule">>config.h +echo #define HAVE_STRERROR>>config.h echo #endif>>config.h diff --git a/src/libs/common/strerror_r.c b/src/libs/common/strerror_r.c index 20da04b3..f0bcde8b 100644 --- a/src/libs/common/strerror_r.c +++ b/src/libs/common/strerror_r.c @@ -42,11 +42,12 @@ Note that this replacement function is NOT thread-safe! */ int mule_strerror_r(int errnum, char *buf, size_t buflen) { + char *tmp; if ((buf == NULL) || (buflen == 0)) { errno = ERANGE; return -1; } - char *tmp = strerror(errnum); + tmp = strerror(errnum); if (tmp == NULL) { errno = EINVAL; return -1; -- 2.11.4.GIT