diff options
| author | tjenssen <tim.jenssen@nokia.com> | 2012-03-13 13:35:58 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2012-03-13 17:35:33 +0100 |
| commit | 640c7e6fb8ab113edb69455d75d3bc05856fdf0f (patch) | |
| tree | 44f45dd94eccf8849aaad001fb321e4a32b10f57 /installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip | |
| parent | ac25995f5c24000a73b4da2d52eac8f3e6ae65d9 (diff) | |
adjust new 7zip files to fit into the installer frame work
- to initialize the 7zlib supported archives we need this kind of
registerMethods in RegisterArc.h and RegisterCodec.h
Change-Id: Ia4dec96c7641d9e0784ee5e6f7423544fc16aece
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip')
| -rw-r--r-- | installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterArc.h | 4 | ||||
| -rw-r--r-- | installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterCodec.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterArc.h b/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterArc.h index 45236a5f1..305aac1fd 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterArc.h +++ b/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterArc.h @@ -27,6 +27,6 @@ void RegisterArc(const CArcInfo *arcInfo); #define REGISTER_ARC(x) struct REGISTER_ARC_NAME(x) { \ REGISTER_ARC_NAME(x)() { RegisterArc(&g_ArcInfo); }}; \ - static REGISTER_ARC_NAME(x) g_RegisterArc; - + static REGISTER_ARC_NAME(x) g_RegisterArc; \ + void registerArc##x() { static REGISTER_ARC_NAME(x) g_RegisterArc; } #endif diff --git a/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterCodec.h b/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterCodec.h index 786b4a4ce..d53c4344a 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterCodec.h +++ b/installerbuilder/libinstaller/3rdparty/7zip/unix/CPP/7zip/Common/RegisterCodec.h @@ -22,12 +22,13 @@ void RegisterCodec(const CCodecInfo *codecInfo); #define REGISTER_CODEC(x) struct REGISTER_CODEC_NAME(x) { \ REGISTER_CODEC_NAME(x)() { RegisterCodec(&g_CodecInfo); }}; \ - static REGISTER_CODEC_NAME(x) g_RegisterCodec; + static REGISTER_CODEC_NAME(x) g_RegisterCodec; \ + void registerCodec##x() { static REGISTER_CODEC_NAME(x) g_RegisterCodecs; } #define REGISTER_CODECS_NAME(x) CRegisterCodecs ## x #define REGISTER_CODECS(x) struct REGISTER_CODECS_NAME(x) { \ REGISTER_CODECS_NAME(x)() { for (int i = 0; i < sizeof(g_CodecsInfo) / sizeof(g_CodecsInfo[0]); i++) \ RegisterCodec(&g_CodecsInfo[i]); }}; \ - static REGISTER_CODECS_NAME(x) g_RegisterCodecs; - + static REGISTER_CODECS_NAME(x) g_RegisterCodecs; \ + void registerCodec##x() { static REGISTER_CODECS_NAME(x) g_RegisterCodecs; } #endif |