From 886874b6964c064cfc022099f3896addb6a5ec65 Mon Sep 17 00:00:00 2001 From: mazze Date: Wed, 4 Dec 2013 21:14:36 +0000 Subject: [PATCH] Build preferences.library with actual defs.h git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@48517 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- scalos/libraries/preferences/Preferences.c | 20 +++++++------- scalos/libraries/preferences/Preferences.h | 20 +++++++------- scalos/libraries/preferences/preferences-aros.conf | 32 ++++++++-------------- 3 files changed, 31 insertions(+), 41 deletions(-) diff --git a/scalos/libraries/preferences/Preferences.c b/scalos/libraries/preferences/Preferences.c index a14192c33..efef7c9ba 100644 --- a/scalos/libraries/preferences/Preferences.c +++ b/scalos/libraries/preferences/Preferences.c @@ -349,7 +349,7 @@ void PreferencesCleanup(struct PreferencesBase *PreferencesBase) LIBFUNC_P2(APTR, LIBAllocPrefsHandle, A0, CONST_STRPTR, Name, - A6, struct PreferencesBase *, PreferencesBase) + A6, struct PreferencesBase *, PreferencesBase, 5) { struct PrefsListEntry *pleFound = NULL; @@ -398,7 +398,7 @@ LIBFUNC_END LIBFUNC_P2(void, LIBFreePrefsHandle, A0, APTR, PrefsHandle, - A6, struct PreferencesBase *, PreferencesBase) + A6, struct PreferencesBase *, PreferencesBase, 6) { struct PrefsListEntry *ple = (struct PrefsListEntry *) PrefsHandle; @@ -439,7 +439,7 @@ LIBFUNC_P6(void, LIBSetPreferences, D1, ULONG, tag, A1, const APTR, Struct, D2, UWORD, StructSize, - A6, struct PreferencesBase *, PreferencesBase) + A6, struct PreferencesBase *, PreferencesBase, 7) { struct PrefsListEntry *ple = (struct PrefsListEntry *) PrefsHandle; @@ -527,7 +527,7 @@ LIBFUNC_P6(ULONG, LIBGetPreferences, D1, ULONG, tag, A1, APTR, Struct, D2, UWORD, StructSize, - A6, struct PreferencesBase *, PreferencesBase) + A6, struct PreferencesBase *, PreferencesBase, 8) { struct PrefsListEntry *ple = (struct PrefsListEntry *) PrefsHandle; ULONG BytesCopied = 0; @@ -598,7 +598,7 @@ LIBFUNC_END LIBFUNC_P3(void, LIBReadPrefsHandle, A0, APTR, PrefsHandle, A1, CONST_STRPTR, Filename, - A6, struct PreferencesBase *, PreferencesBase) + A6, struct PreferencesBase *, PreferencesBase, 9) { struct PrefsListEntry *ple = (struct PrefsListEntry *) PrefsHandle; struct IFFHandle *iff; @@ -748,7 +748,7 @@ LIBFUNC_END LIBFUNC_P3(void, LIBWritePrefsHandle, A0, APTR, PrefsHandle, A1, CONST_STRPTR, Filename, - A6, struct PreferencesBase *, PreferencesBase) + A6, struct PreferencesBase *, PreferencesBase, 10) { struct PrefsListEntry *ple = (struct PrefsListEntry *) PrefsHandle; struct IFFHandle *iff; @@ -907,7 +907,7 @@ LIBFUNC_P4(struct PrefsStruct *, LIBFindPreferences, A0, APTR, PrefsHandle, D0, ULONG, ID, D1, ULONG, tag, - A6, struct PreferencesBase *, PreferencesBase) + A6, struct PreferencesBase *, PreferencesBase, 11) { struct PrefsListEntry *ple = (struct PrefsListEntry *) PrefsHandle; struct PrefsStruct *ps = NULL; @@ -978,7 +978,7 @@ LIBFUNC_P7(void, LIBSetEntry, A1, const APTR, Struct, D2, UWORD, StructSize, D3, ULONG, Entry, - A6, struct PreferencesBase *, PreferencesBase) + A6, struct PreferencesBase *, PreferencesBase, 12) { struct PrefsListEntry *ple = (struct PrefsListEntry *) PrefsHandle; @@ -1099,7 +1099,7 @@ LIBFUNC_P7(ULONG, LIBGetEntry, A1, APTR, Struct, D2, UWORD, StructSize, D3, ULONG, Entry, - A6, struct PreferencesBase *, PreferencesBase) + A6, struct PreferencesBase *, PreferencesBase, 13) { struct PrefsListEntry *ple = (struct PrefsListEntry *) PrefsHandle; ULONG BytesCopied = 0; @@ -1185,7 +1185,7 @@ LIBFUNC_P5(ULONG, LIBRemEntry, D0, ULONG, ID, D1, ULONG, tag, D2, ULONG, Entry, - A6, struct PreferencesBase *, PreferencesBase) + A6, struct PreferencesBase *, PreferencesBase, 14) { struct PrefsListEntry *ple = (struct PrefsListEntry *) PrefsHandle; ULONG Success = 0; diff --git a/scalos/libraries/preferences/Preferences.h b/scalos/libraries/preferences/Preferences.h index 5ebc8a9d5..a73a9f88a 100644 --- a/scalos/libraries/preferences/Preferences.h +++ b/scalos/libraries/preferences/Preferences.h @@ -28,37 +28,37 @@ void PreferencesCleanup(struct PreferencesBase *PreferencesBase); LIBFUNC_P2_PROTO(APTR, LIBAllocPrefsHandle, A0, CONST_STRPTR, Name, - A6, struct PreferencesBase *, PreferencesBase); + A6, struct PreferencesBase *, PreferencesBase, 5); LIBFUNC_P2_PROTO(void, LIBFreePrefsHandle, A0, APTR, PrefsHandle, - A6, struct PreferencesBase *, PreferencesBase); + A6, struct PreferencesBase *, PreferencesBase, 6); LIBFUNC_P6_PROTO(void, LIBSetPreferences, A0, APTR, PrefsHandle, D0, ULONG, id, D1, ULONG, tag, A1, const APTR, Struct, D2, UWORD, StructSize, - A6, struct PreferencesBase *, PreferencesBase); + A6, struct PreferencesBase *, PreferencesBase, 7); LIBFUNC_P6_PROTO(ULONG, LIBGetPreferences, A0, APTR, PrefsHandle, D0, ULONG, id, D1, ULONG, tag, A1, APTR, Struct, D2, UWORD, StructSize, - A6, struct PreferencesBase *, PreferencesBase); + A6, struct PreferencesBase *, PreferencesBase, 8); LIBFUNC_P3_PROTO(void, LIBReadPrefsHandle, A0, APTR, PrefsHandle, A1, CONST_STRPTR, Filename, - A6, struct PreferencesBase *, PreferencesBase); + A6, struct PreferencesBase *, PreferencesBase, 9); LIBFUNC_P3_PROTO(void, LIBWritePrefsHandle, A0, APTR, PrefsHandle, A1, CONST_STRPTR, Filename, - A6, struct PreferencesBase *, PreferencesBase); + A6, struct PreferencesBase *, PreferencesBase, 10); LIBFUNC_P4_PROTO(struct PrefsStruct *, LIBFindPreferences, A0, APTR, PrefsHandle, D0, ULONG, ID, D1, ULONG, tag, - A6, struct PreferencesBase *, PreferencesBase); + A6, struct PreferencesBase *, PreferencesBase, 11); LIBFUNC_P7_PROTO(void, LIBSetEntry, A0, APTR, PrefsHandle, D0, ULONG, ID, @@ -66,7 +66,7 @@ LIBFUNC_P7_PROTO(void, LIBSetEntry, A1, const APTR, Struct, D2, UWORD, StructSize, D3, ULONG, Entry, - A6, struct PreferencesBase *, PreferencesBase); + A6, struct PreferencesBase *, PreferencesBase, 12); LIBFUNC_P7_PROTO(ULONG, LIBGetEntry, A0, APTR, PrefsHandle, D0, ULONG, ID, @@ -74,13 +74,13 @@ LIBFUNC_P7_PROTO(ULONG, LIBGetEntry, A1, const APTR, Struct, D2, UWORD, StructSize, D3, ULONG, Entry, - A6, struct PreferencesBase *, PreferencesBase); + A6, struct PreferencesBase *, PreferencesBase, 13); LIBFUNC_P5_PROTO(ULONG, LIBRemEntry, A0, APTR, PrefsHandle, D0, ULONG, ID, D1, ULONG, tag, D2, ULONG, Entry, - A6, struct PreferencesBase *, PreferencesBase); + A6, struct PreferencesBase *, PreferencesBase, 14); //---------------------------------------------------------------------------- diff --git a/scalos/libraries/preferences/preferences-aros.conf b/scalos/libraries/preferences/preferences-aros.conf index e3377ef3b..f45f087cb 100644 --- a/scalos/libraries/preferences/preferences-aros.conf +++ b/scalos/libraries/preferences/preferences-aros.conf @@ -1,5 +1,5 @@ ##begin config -basename Preferences +basename PreferencesBase libbase PreferencesBase libbasetype struct Library version 41.2 @@ -12,33 +12,23 @@ version 41.2 ##begin functionlist APTR AllocPrefsHandle(CONST_STRPTR name) (A0) -.function PreferencesBase_0_LIBAllocPrefsHandle -.cfunction +.function LIBAllocPrefsHandle VOID FreePrefsHandle(APTR prefsHandle) (A0) -.function PreferencesBase_0_LIBFreePrefsHandle -.cfunction +.function LIBFreePrefsHandle VOID SetPreferences(APTR prefsHandle, ULONG iD, ULONG prefsTag, const APTR a1arg, WORD struct_Size) (A0,D0,D1,A1,D2) -.function PreferencesBase_0_LIBSetPreferences -.cfunction +.function LIBSetPreferences ULONG GetPreferences(APTR prefsHandle, ULONG iD, ULONG prefsTag, APTR a1arg, UWORD struct_Size) (A0,D0,D1,A1,D2) -.function PreferencesBase_0_LIBGetPreferences -.cfunction +.function LIBGetPreferences VOID ReadPrefsHandle(APTR prefsHandle, CONST_STRPTR filename) (A0,A1) -.function PreferencesBase_0_LIBReadPrefsHandle -.cfunction +.function LIBReadPrefsHandle VOID WritePrefsHandle(APTR prefsHandle, CONST_STRPTR filename) (A0,A1) -.function PreferencesBase_0_LIBWritePrefsHandle -.cfunction +.function LIBWritePrefsHandle struct PrefsStruct * FindPreferences(APTR prefsHandle, ULONG iD, ULONG prefsTag) (A0,D0,D1) -.function PreferencesBase_0_LIBFindPreferences -.cfunction +.function LIBFindPreferences VOID SetEntry(APTR prefsHandle, ULONG iD, ULONG prefsTag, const APTR a1arg, UWORD struct_Size, ULONG entry) (A0,D0,D1,A1,D2,D3) -.function PreferencesBase_0_LIBSetEntry -.cfunction +.function LIBSetEntry ULONG GetEntry(APTR prefsHandle, ULONG iD, ULONG prefsTag, APTR a1arg, UWORD struct_Size, ULONG entry) (A0,D0,D1,A1,D2,D3) -.function PreferencesBase_0_LIBGetEntry -.cfunction +.function LIBGetEntry ULONG RemEntry(APTR prefsHandle, ULONG iD, ULONG prefsTag, ULONG entry) (A0,D0,D1,D2) -.function PreferencesBase_0_LIBRemEntry -.cfunction +.function LIBRemEntry ##end functionlist -- 2.11.4.GIT