diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
| commit | e2682561337c521f10fa2c87594c86c01b3c662a (patch) | |
| tree | a8cb220cf9888183c2de5edd3644597c63b67b9a /package/inc/Deflater.hxx | |
| parent | 68f53efa2572acc661c8a75ee2ec09f87348aa65 (diff) | |
| parent | f9c2beb2cdb4ae448d22ae390c63159b88df9e9e (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
setup_native/prj/build.lst
setup_native/prj/d.lst
wizards/Jar_query.mk
wizards/Module_wizards.mk
wizards/Zip_launcher.mk
wizards/com/sun/star/wizards/report/makefile.mk
wizards/prj/build.lst
wizards/prj/d.lst
wizards/util/target.pmk
Diffstat (limited to 'package/inc/Deflater.hxx')
| -rw-r--r-- | package/inc/Deflater.hxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx index f39b8e2b9547..6c1cf4456d30 100644 --- a/package/inc/Deflater.hxx +++ b/package/inc/Deflater.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,14 +29,16 @@ #define _DEFLATER_HXX_ #include <com/sun/star/uno/Sequence.hxx> +#include "packagedllapi.hxx" -extern "C" +struct z_stream_s; + +namespace ZipUtils { + +class DLLPUBLIC_PACKAGE Deflater { typedef struct z_stream_s z_stream; -} -class Deflater -{ protected: com::sun::star::uno::Sequence< sal_Int8 > sInBuffer; sal_Bool bFinish; @@ -63,4 +66,8 @@ public: void SAL_CALL end( ); }; +} + #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |