From c345108cc05e874b91ad1fa082d3dd3474a1483d Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 2 Apr 2005 11:23:12 +0000 Subject: [PATCH] added NSISCALL to functions used in the stub (EXEHEAD) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3944 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/bzip2/bzlib.c | 6 +++--- Source/bzip2/bzlib.h | 4 ++-- Source/bzip2/decompress.c | 6 +++--- Source/bzip2/huffman.c | 15 ++++++++------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Source/bzip2/bzlib.c b/Source/bzip2/bzlib.c index 0badda5f..8c2c5cad 100644 --- a/Source/bzip2/bzlib.c +++ b/Source/bzip2/bzlib.c @@ -439,7 +439,7 @@ int BZ2_bzCompressEnd( bz_stream *strm ) #ifdef NSIS_COMPRESS_BZIP2_SMALLMODE /*---------------------------------------------------*/ -Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab ) +Int32 NSISCALL BZ2_indexIntoF ( Int32 indx, Int32 *cftab ) { Int32 nb, na, mid; nb = 0; @@ -454,7 +454,7 @@ Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab ) static -void unRLE_obuf_to_output_SMALL ( DState* s ) +void NSISCALL unRLE_obuf_to_output_SMALL ( DState* s ) { UChar k1; while (True) { @@ -493,7 +493,7 @@ void unRLE_obuf_to_output_SMALL ( DState* s ) } } #else//!small, fast -static void unRLE_obuf_to_output_FAST ( DState* s ) +static void NSISCALL unRLE_obuf_to_output_FAST ( DState* s ) { UChar k1; diff --git a/Source/bzip2/bzlib.h b/Source/bzip2/bzlib.h index 13236e91..302cdf6f 100644 --- a/Source/bzip2/bzlib.h +++ b/Source/bzip2/bzlib.h @@ -414,9 +414,9 @@ extern Int32 BZ2_indexIntoF( Int32, Int32* ); #endif//smallmode /*-- externs for decompression. --*/ -extern Int32 BZ2_decompress ( DState* ); +extern Int32 NSISCALL BZ2_decompress ( DState* ); -extern void BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*, +extern void NSISCALL BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*, Int32, Int32, Int32 ); diff --git a/Source/bzip2/decompress.c b/Source/bzip2/decompress.c index 5e907d4d..40b41704 100644 --- a/Source/bzip2/decompress.c +++ b/Source/bzip2/decompress.c @@ -67,7 +67,7 @@ { retVal = rrr; goto save_state_and_return; }; -static int __mygetbits(int *vtmp, int nnn, DState* s) +static int NSISCALL __mygetbits(int *vtmp, int nnn, DState* s) { for (;;) { if (s->bsLive >= nnn) { @@ -96,7 +96,7 @@ static int __mygetbits(int *vtmp, int nnn, DState* s) #define GET_BIT(lll,uuu) \ GET_BITS(lll,uuu,1) -static int getmtf1(DState_save *sv,DState* s) +static int NSISCALL getmtf1(DState_save *sv,DState* s) { if (sv->groupPos == 0) { sv->groupNo++; @@ -133,7 +133,7 @@ static int getmtf1(DState_save *sv,DState* s) /*---------------------------------------------------*/ -Int32 BZ2_decompress ( DState* s ) +Int32 NSISCALL BZ2_decompress ( DState* s ) { Int32 uc; Int32 retVal; diff --git a/Source/bzip2/huffman.c b/Source/bzip2/huffman.c index 6c92effd..a52dcee1 100644 --- a/Source/bzip2/huffman.c +++ b/Source/bzip2/huffman.c @@ -191,13 +191,14 @@ void BZ2_hbAssignCodes ( Int32 *code, /*---------------------------------------------------*/ -void BZ2_hbCreateDecodeTables ( Int32 *limit, - Int32 *base, - Int32 *perm, - UChar *length, - Int32 minLen, - Int32 maxLen, - Int32 alphaSize ) +void NSISCALL +BZ2_hbCreateDecodeTables ( Int32 *limit, + Int32 *base, + Int32 *perm, + UChar *length, + Int32 minLen, + Int32 maxLen, + Int32 alphaSize ) { Int32 pp, i, j, vec;