mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsvglibs: adjusted makefiles to build external rsvglib dependencies

Browse Source
This commit is contained in:
ka
2011-03-25 06:25:10 +01:00
parent 8427b0f498
commit 91e5a39cf2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/source/zipapi/Deflater.cxx
View File

@@ -93,7 +93,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int
pStream->avail_in = nLength; pStream->avail_in = nLength;
pStream->avail_out = nNewLength; pStream->avail_out = nNewLength;
#ifdef SYSTEM_ZLIB #if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
nResult = deflateParams(pStream, nLevel, nStrategy); nResult = deflateParams(pStream, nLevel, nStrategy);
#else #else
nResult = z_deflateParams(pStream, nLevel, nStrategy); nResult = z_deflateParams(pStream, nLevel, nStrategy);
@@ -119,7 +119,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int
pStream->avail_in = nLength; pStream->avail_in = nLength;
pStream->avail_out = nNewLength; pStream->avail_out = nNewLength;
#ifdef SYSTEM_ZLIB #if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH); nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#else #else
nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH); nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
@@ -188,7 +188,7 @@ sal_Int32 SAL_CALL Deflater::getTotalOut( )
} }
void SAL_CALL Deflater::reset( ) void SAL_CALL Deflater::reset( )
{ {
#ifdef SYSTEM_ZLIB #if defined SYSTEM_ZLIB || !defined ZLIB_PREFIXB
deflateReset(pStream); deflateReset(pStream);
#else #else
z_deflateReset(pStream); z_deflateReset(pStream);
@@ -201,7 +201,7 @@ void SAL_CALL Deflater::end( )
{ {
if (pStream != NULL) if (pStream != NULL)
{ {
#ifdef SYSTEM_ZLIB #if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
deflateEnd(pStream); deflateEnd(pStream);
#else #else
z_deflateEnd(pStream); z_deflateEnd(pStream);

4
package/source/zipapi/Inflater.cxx
View File

@@ -105,7 +105,7 @@ void SAL_CALL Inflater::end( )
{ {
if (pStream != NULL) if (pStream != NULL)
{ {
#ifdef SYSTEM_ZLIB #if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
inflateEnd(pStream); inflateEnd(pStream);
#else #else
z_inflateEnd(pStream); z_inflateEnd(pStream);
@@ -130,7 +130,7 @@ sal_Int32 Inflater::doInflateBytes (Sequence < sal_Int8 > &rBuffer, sal_Int32 n
pStream->next_out = reinterpret_cast < unsigned char* > ( rBuffer.getArray() + nNewOffset ); pStream->next_out = reinterpret_cast < unsigned char* > ( rBuffer.getArray() + nNewOffset );
pStream->avail_out = nNewLength; pStream->avail_out = nNewLength;
#ifdef SYSTEM_ZLIB #if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
sal_Int32 nResult = ::inflate(pStream, Z_PARTIAL_FLUSH); sal_Int32 nResult = ::inflate(pStream, Z_PARTIAL_FLUSH);
#else #else
sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH); sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH);