From 5f9f4779062ebd37e2f2c3cbc9db3c15a1a9408b Mon Sep 17 00:00:00 2001 From: verhaegs Date: Wed, 21 Dec 2011 19:55:53 +0000 Subject: [PATCH] workbench/locale/languages: Use AROS_LDn macro to get prototype of AROS_LHn defined functions. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@43163 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- "workbench/locale/languages/catal\303\240.c" | 24 ++++++++++++++-------- workbench/locale/languages/esperanto.c | 18 ++++++++++------ workbench/locale/languages/malti.c | 18 ++++++++++------ workbench/locale/languages/shqipja.c | 18 ++++++++++------ workbench/locale/languages/thai.c | 18 ++++++++++------ .../locale/languages/t\303\274rk\303\247e.c" | 18 ++++++++++------ "workbench/locale/languages/\303\255slenska.c" | 18 ++++++++++------ 7 files changed, 88 insertions(+), 44 deletions(-) diff --git "a/workbench/locale/languages/catal\303\240.c" "b/workbench/locale/languages/catal\303\240.c" index ed33b13fb9..eacca5d5f0 100644 --- "a/workbench/locale/languages/catal\303\240.c" +++ "b/workbench/locale/languages/catal\303\240.c" @@ -25,7 +25,10 @@ #define LANGREV 0 /* Revision number of language */ #define LANGTAG "\0$VER: "LANGSTR".language 41.0 (08.01.1998)" -STRPTR AROS_SLIB_ENTRY(getlangstring,language,9)(); +AROS_LD1(STRPTR, getlangstring, + AROS_LDA(ULONG, id, D0), + struct LocaleBase *, LocaleBase, 9, language +); /* ----------------------------------------------------------------------- */ @@ -51,11 +54,14 @@ extern const UBYTE version[]; extern const APTR inittabl[4]; extern void *const functable[]; extern struct Language *AROS_SLIB_ENTRY(init,language,0)(); -extern struct Language *AROS_SLIB_ENTRY(open,language,1)(); -extern BPTR AROS_SLIB_ENTRY(close,language,2)(); -extern BPTR AROS_SLIB_ENTRY(expunge,language,3)(); -extern int AROS_SLIB_ENTRY(null,language,0)(); -extern ULONG AROS_SLIB_ENTRY(mask,language,5)(); +AROS_LD1(struct Language *, open, + AROS_LDA(ULONG, version, D0), + struct Language *, language, 1, language +); +AROS_LD0(BPTR, close, struct Language *, language, 2, language); +AROS_LD0(BPTR, expunge, struct Language *, language, 3, language); +AROS_LD0I(int, null, struct Language *, language, 0, language); +AROS_LD0(ULONG, mask, struct Language *, language, 5, language); extern const char end; int entry(void) @@ -130,7 +136,8 @@ AROS_UFH3(struct Language *, AROS_SLIB_ENTRY(init,language,0), AROS_LH1(struct Language *, open, AROS_LHA(ULONG, version, D0), - struct Language *, language, 1, language) + struct Language *, language, 1, language +) { AROS_LIBFUNC_INIT language->library.lib_OpenCnt++; @@ -220,7 +227,8 @@ AROS_LH0(ULONG, mask, struct Language *, language, 5, language) */ AROS_LH1(STRPTR, getlangstring, AROS_LHA(ULONG, id, D0), - struct LocaleBase *, LocaleBase, 9, language) + struct LocaleBase *, LocaleBase, 9, language +) { AROS_LIBFUNC_INIT diff --git a/workbench/locale/languages/esperanto.c b/workbench/locale/languages/esperanto.c index 8d9b968b5d..ee7edf2fa9 100644 --- a/workbench/locale/languages/esperanto.c +++ b/workbench/locale/languages/esperanto.c @@ -24,7 +24,10 @@ #define LANGREV 0 /* Revision number of language */ #define LANGTAG "\0$VER: esperanto.language 41.0 (01.06.1997)" -STRPTR AROS_SLIB_ENTRY(getlangstring,language,9)(); +AROS_LD1(STRPTR, getlangstring, + AROS_LDA(ULONG, id, D0), + struct LocaleBase *, LocaleBase, 9, language +); /* ----------------------------------------------------------------------- */ @@ -50,11 +53,14 @@ extern const UBYTE version[]; extern const APTR inittabl[4]; extern void *const functable[]; extern struct Language *AROS_SLIB_ENTRY(init,language,0)(); -extern struct Language *AROS_SLIB_ENTRY(open,language,1)(); -extern BPTR AROS_SLIB_ENTRY(close,language,2)(); -extern BPTR AROS_SLIB_ENTRY(expunge,language,3)(); -extern int AROS_SLIB_ENTRY(null,language,0)(); -extern ULONG AROS_SLIB_ENTRY(mask,language,4)(); +AROS_LD1(struct Language *, open, + AROS_LDA(ULONG, version, D0), + struct Language *, language, 1, language +); +AROS_LD0(BPTR, close, struct Language *, language, 2, language); +AROS_LD0(BPTR, expunge, struct Language *, language, 3, language); +AROS_LD0I(int, null, struct Language *, language, 0, language); +AROS_LD0(ULONG, mask, struct Language *, language, 5, language); extern const char end; int entry(void) diff --git a/workbench/locale/languages/malti.c b/workbench/locale/languages/malti.c index 777b166908..0a2b578a62 100644 --- a/workbench/locale/languages/malti.c +++ b/workbench/locale/languages/malti.c @@ -24,7 +24,10 @@ #define LANGREV 0 /* Revision number of language */ #define LANGTAG "\0$VER: "LANGSTR".language 41.0 (23.11.2010)" -STRPTR AROS_SLIB_ENTRY(getlangstring,language,9)(); +AROS_LD1(STRPTR, getlangstring, + AROS_LDA(ULONG, id, D0), + struct LocaleBase *, LocaleBase, 9, language +); /* ----------------------------------------------------------------------- */ @@ -50,11 +53,14 @@ extern const UBYTE version[]; extern const APTR inittabl[4]; extern void *const functable[]; extern struct Language *AROS_SLIB_ENTRY(init,language,0)(); -extern struct Language *AROS_SLIB_ENTRY(open,language,1)(); -extern BPTR AROS_SLIB_ENTRY(close,language,2)(); -extern BPTR AROS_SLIB_ENTRY(expunge,language,3)(); -extern int AROS_SLIB_ENTRY(null,language,0)(); -extern ULONG AROS_SLIB_ENTRY(mask,language,5)(); +AROS_LD1(struct Language *, open, + AROS_LDA(ULONG, version, D0), + struct Language *, language, 1, language +); +AROS_LD0(BPTR, close, struct Language *, language, 2, language); +AROS_LD0(BPTR, expunge, struct Language *, language, 3, language); +AROS_LD0I(int, null, struct Language *, language, 0, language); +AROS_LD0(ULONG, mask, struct Language *, language, 5, language); extern const char end; int entry(void) diff --git a/workbench/locale/languages/shqipja.c b/workbench/locale/languages/shqipja.c index 90ad75030f..ddb92e99e8 100644 --- a/workbench/locale/languages/shqipja.c +++ b/workbench/locale/languages/shqipja.c @@ -25,7 +25,10 @@ #define LANGREV 0 /* Revision number of language */ #define LANGTAG "\0$VER: "LANGSTR".language 41.0 (14.08.2010)" -STRPTR AROS_SLIB_ENTRY(getlangstring,language,9)(); +AROS_LD1(STRPTR, getlangstring, + AROS_LDA(ULONG, id, D0), + struct LocaleBase *, LocaleBase, 9, language +); /* ----------------------------------------------------------------------- */ @@ -51,11 +54,14 @@ extern const UBYTE version[]; extern const APTR inittabl[4]; extern void *const functable[]; extern struct Language *AROS_SLIB_ENTRY(init,language,0)(); -extern struct Language *AROS_SLIB_ENTRY(open,language,1)(); -extern BPTR AROS_SLIB_ENTRY(close,language,2)(); -extern BPTR AROS_SLIB_ENTRY(expunge,language,3)(); -extern int AROS_SLIB_ENTRY(null,language,0)(); -extern ULONG AROS_SLIB_ENTRY(mask,language,5)(); +AROS_LD1(struct Language *, open, + AROS_LDA(ULONG, version, D0), + struct Language *, language, 1, language +); +AROS_LD0(BPTR, close, struct Language *, language, 2, language); +AROS_LD0(BPTR, expunge, struct Language *, language, 3, language); +AROS_LD0I(int, null, struct Language *, language, 0, language); +AROS_LD0(ULONG, mask, struct Language *, language, 5, language); extern const char end; int entry(void) diff --git a/workbench/locale/languages/thai.c b/workbench/locale/languages/thai.c index e38c357834..a199834a33 100644 --- a/workbench/locale/languages/thai.c +++ b/workbench/locale/languages/thai.c @@ -26,7 +26,10 @@ #define LANGREV 0 /* Revision number of language */ #define LANGTAG "\0$VER: "LANGSTR".language 41.0 (11.02.2011)" -STRPTR AROS_SLIB_ENTRY(getlangstring,language,9)(); +AROS_LD1(STRPTR, getlangstring, + AROS_LDA(ULONG, id, D0), + struct LocaleBase *, LocaleBase, 9, language +); /* ----------------------------------------------------------------------- */ @@ -52,11 +55,14 @@ extern const UBYTE version[]; extern const APTR inittabl[4]; extern void *const functable[]; extern struct Language *AROS_SLIB_ENTRY(init,language,0)(); -extern struct Language *AROS_SLIB_ENTRY(open,language,1)(); -extern BPTR AROS_SLIB_ENTRY(close,language,2)(); -extern BPTR AROS_SLIB_ENTRY(expunge,language,3)(); -extern int AROS_SLIB_ENTRY(null,language,0)(); -extern ULONG AROS_SLIB_ENTRY(mask,language,5)(); +AROS_LD1(struct Language *, open, + AROS_LDA(ULONG, version, D0), + struct Language *, language, 1, language +); +AROS_LD0(BPTR, close, struct Language *, language, 2, language); +AROS_LD0(BPTR, expunge, struct Language *, language, 3, language); +AROS_LD0I(int, null, struct Language *, language, 0, language); +AROS_LD0(ULONG, mask, struct Language *, language, 5, language); extern const char end; int entry(void) diff --git "a/workbench/locale/languages/t\303\274rk\303\247e.c" "b/workbench/locale/languages/t\303\274rk\303\247e.c" index ce983eed41..5efbf37b77 100644 --- "a/workbench/locale/languages/t\303\274rk\303\247e.c" +++ "b/workbench/locale/languages/t\303\274rk\303\247e.c" @@ -26,7 +26,10 @@ #define LANGREV 0 /* Revision number of language */ #define LANGTAG "\0$VER: "LANGSTR".language 41.0 (14.08.2010)" -STRPTR AROS_SLIB_ENTRY(getlangstring,language,9)(); +AROS_LD1(STRPTR, getlangstring, + AROS_LDA(ULONG, id, D0), + struct LocaleBase *, LocaleBase, 9, language +); /* ----------------------------------------------------------------------- */ @@ -52,11 +55,14 @@ extern const UBYTE version[]; extern const APTR inittabl[4]; extern void *const functable[]; extern struct Language *AROS_SLIB_ENTRY(init,language,0)(); -extern struct Language *AROS_SLIB_ENTRY(open,language,1)(); -extern BPTR AROS_SLIB_ENTRY(close,language,2)(); -extern BPTR AROS_SLIB_ENTRY(expunge,language,3)(); -extern int AROS_SLIB_ENTRY(null,language,0)(); -extern ULONG AROS_SLIB_ENTRY(mask,language,5)(); +AROS_LD1(struct Language *, open, + AROS_LDA(ULONG, version, D0), + struct Language *, language, 1, language +); +AROS_LD0(BPTR, close, struct Language *, language, 2, language); +AROS_LD0(BPTR, expunge, struct Language *, language, 3, language); +AROS_LD0I(int, null, struct Language *, language, 0, language); +AROS_LD0(ULONG, mask, struct Language *, language, 5, language); extern const char end; int entry(void) diff --git "a/workbench/locale/languages/\303\255slenska.c" "b/workbench/locale/languages/\303\255slenska.c" index 144ef00e1b..4a19fffd0a 100644 --- "a/workbench/locale/languages/\303\255slenska.c" +++ "b/workbench/locale/languages/\303\255slenska.c" @@ -25,7 +25,10 @@ #define LANGREV 0 /* Revision number of language */ #define LANGTAG "\0$VER: íslenska.language 41.0 (03.02.2001)" -STRPTR AROS_SLIB_ENTRY(getlangstring,language,9)(); +AROS_LD1(STRPTR, getlangstring, + AROS_LDA(ULONG, id, D0), + struct LocaleBase *, LocaleBase, 9, language +); /* ----------------------------------------------------------------------- */ @@ -51,11 +54,14 @@ extern const UBYTE version[]; extern const APTR inittabl[4]; extern void *const functable[]; extern struct Language *AROS_SLIB_ENTRY(init,language,0)(); -extern struct Language *AROS_SLIB_ENTRY(open,language,1)(); -extern BPTR AROS_SLIB_ENTRY(close,language,2)(); -extern BPTR AROS_SLIB_ENTRY(expunge,language,3)(); -extern int AROS_SLIB_ENTRY(null,language,0)(); -extern ULONG AROS_SLIB_ENTRY(mask,language,5)(); +AROS_LD1(struct Language *, open, + AROS_LDA(ULONG, version, D0), + struct Language *, language, 1, language +); +AROS_LD0(BPTR, close, struct Language *, language, 2, language); +AROS_LD0(BPTR, expunge, struct Language *, language, 3, language); +AROS_LD0I(int, null, struct Language *, language, 0, language); +AROS_LD0(ULONG, mask, struct Language *, language, 5, language); extern const char end; int entry(void) -- 2.11.4.GIT