From f43b6155bae1f0f94e8c4f00938544674e8fc383 Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Fri, 8 Jul 2011 04:14:46 +0000 Subject: [PATCH] locale.library: Fix some LVO mismatches Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@39894 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/libs/locale/locale.conf | 3 +++ workbench/libs/locale/locrawdofmt.c | 2 +- workbench/libs/locale/patches.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/workbench/libs/locale/locale.conf b/workbench/libs/locale/locale.conf index c54b3da333..eb720bc35e 100644 --- a/workbench/libs/locale/locale.conf +++ b/workbench/libs/locale/locale.conf @@ -9,6 +9,7 @@ options noexpunge #include #include #include +#include /* For va_list in VNewRawDoFmt */ __BEGIN_DECLS @@ -72,4 +73,6 @@ LONG LocStrToDate(struct DateTime *datetime) (D1) .private CONST_STRPTR LocDosGetLocalizedString(LONG stringNum) (D1) .private +APTR LocVNewRawDoFmt(CONST_STRPTR FormatString, VOID_FUNC PutChProc, APTR PutChData, va_list DataStream) (A0, A2, A3, A1) +.private ##end functionlist diff --git a/workbench/libs/locale/locrawdofmt.c b/workbench/libs/locale/locrawdofmt.c index d7986cfd1c..6793c7f555 100644 --- a/workbench/libs/locale/locrawdofmt.c +++ b/workbench/libs/locale/locrawdofmt.c @@ -302,7 +302,7 @@ AROS_UFH3(VOID, LocRawDoFmtFormatStringFunc_SysV, AROS_LHA(va_list , DataStream, A1), /* LOCATION */ - struct ExecBase *, SysBase, 87, Locale) + struct ExecBase *, SysBase, 39, Locale) /* FUNCTION See exec.library/VNewRawDoFmt diff --git a/workbench/libs/locale/patches.c b/workbench/libs/locale/patches.c index 476f73a844..125c6bc50d 100644 --- a/workbench/libs/locale/patches.c +++ b/workbench/libs/locale/patches.c @@ -35,7 +35,7 @@ AROS_LD4(APTR, LocVNewRawDoFmt, AROS_LDA(VOID_FUNC , PutChProc, A2), AROS_LDA(APTR , PutChData, A3), AROS_LDA(va_list , DataStream, A1), - struct ExecBase *, SysBase, 137, Locale); + struct ExecBase *, SysBase, 39, Locale); AROS_LD3(LONG, LocStrnicmp, AROS_LDA(CONST_STRPTR, string1, A0), AROS_LDA(CONST_STRPTR, string2, A1), -- 2.11.4.GIT