gecko-dev/intl/icu-patches/u_setMemoryFunctions-callconvention-anachronism-msvc.diff
André Bargull 1165535aa2 Bug 1353650 - Part 1: Adjust custom ICU patches for ICU 59 update. r=Waldo
--HG--
extra : rebase_source : 50bc963fb87eda50da851f9d903fb71227de13bd
2017-04-19 06:54:47 -07:00

34 lines
1.2 KiB
Diff

Don't annotate function parameters with call-convention modifier to work around a MSVC compiler warning.
https://ssl.icu-project.org/trac/ticket/13030
diff --git a/intl/icu/source/common/unicode/uclean.h b/intl/icu/source/common/unicode/uclean.h
--- a/intl/icu/source/common/unicode/uclean.h
+++ b/intl/icu/source/common/unicode/uclean.h
@@ -143,19 +143,25 @@ typedef void U_CALLCONV UMemFreeFn (con
* are called.
* @param a Pointer to a user-supplied malloc function.
* @param r Pointer to a user-supplied realloc function.
* @param f Pointer to a user-supplied free function.
* @param status Receives error values.
* @stable ICU 2.8
* @system
*/
+#ifndef _MSC_VER
U_STABLE void U_EXPORT2
u_setMemoryFunctions(const void *context, UMemAllocFn * U_CALLCONV a, UMemReallocFn * U_CALLCONV r, UMemFreeFn * U_CALLCONV f,
UErrorCode *status);
+#else
+U_STABLE void U_EXPORT2
+u_setMemoryFunctions(const void *context, UMemAllocFn * a, UMemReallocFn * r, UMemFreeFn * f,
+ UErrorCode *status);
+#endif
U_CDECL_END
#ifndef U_HIDE_DEPRECATED_API
/*********************************************************************************
*
* Deprecated Functions
*