| exports.h | | exports.h | |
| | | | |
| skipping to change at line 22 | | skipping to change at line 22 | |
| #define __XMLSEC_EXPORTS_H__ | | #define __XMLSEC_EXPORTS_H__ | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| /* Now, the export orgy begins. The following we must do for the | | /* Now, the export orgy begins. The following we must do for the | |
| Windows platform with MSVC compiler. */ | | Windows platform with MSVC compiler. */ | |
| | | | |
| #if !defined XMLSEC_EXPORT | | #if !defined XMLSEC_EXPORT | |
|
| # if defined _MSC_VER | | # if defined(_WIN32) | |
| /* if we compile libxmlsec itself: */ | | /* if we compile libxmlsec itself: */ | |
| # if defined(IN_XMLSEC) | | # if defined(IN_XMLSEC) | |
| # if !defined(XMLSEC_STATIC) | | # if !defined(XMLSEC_STATIC) | |
| # define XMLSEC_EXPORT __declspec(dllexport) | | # define XMLSEC_EXPORT __declspec(dllexport) | |
| # else | | # else | |
| # define XMLSEC_EXPORT extern | | # define XMLSEC_EXPORT extern | |
| # endif | | # endif | |
| /* if a client program includes this file: */ | | /* if a client program includes this file: */ | |
| # else | | # else | |
|
| | | #if 1 | |
| | | /* gcc fail by initialisation of global variable with error | |
| | | (as example in .../openssl/ciphers.c): | |
| | | "initializer element is not constant" | |
| | | To avoid this we shouldn't use __declspec(dllimport). | |
| | | This will enable auto-import feature. */ | |
| | | # define XMLSEC_EXPORT | |
| | | #else | |
| # if !defined(XMLSEC_STATIC) | | # if !defined(XMLSEC_STATIC) | |
| # define XMLSEC_EXPORT __declspec(dllimport) | | # define XMLSEC_EXPORT __declspec(dllimport) | |
| # else | | # else | |
| # define XMLSEC_EXPORT | | # define XMLSEC_EXPORT | |
| # endif | | # endif | |
|
| | | #endif | |
| # endif | | # endif | |
| /* This holds on all other platforms/compilers, which are easier to | | /* This holds on all other platforms/compilers, which are easier to | |
| handle in regard to this. */ | | handle in regard to this. */ | |
| # else | | # else | |
| # define XMLSEC_EXPORT | | # define XMLSEC_EXPORT | |
| # endif | | # endif | |
| #endif | | #endif | |
| | | | |
| #if !defined XMLSEC_CRYPTO_EXPORT | | #if !defined XMLSEC_CRYPTO_EXPORT | |
|
| # if defined _MSC_VER | | # if defined(_WIN32) | |
| /* if we compile libxmlsec itself: */ | | /* if we compile libxmlsec itself: */ | |
| # if defined(IN_XMLSEC_CRYPTO) | | # if defined(IN_XMLSEC_CRYPTO) | |
| # if !defined(XMLSEC_STATIC) | | # if !defined(XMLSEC_STATIC) | |
| # define XMLSEC_CRYPTO_EXPORT __declspec(dllexport) | | # define XMLSEC_CRYPTO_EXPORT __declspec(dllexport) | |
| # else | | # else | |
| # define XMLSEC_CRYPTO_EXPORT extern | | # define XMLSEC_CRYPTO_EXPORT extern | |
| # endif | | # endif | |
| /* if a client program includes this file: */ | | /* if a client program includes this file: */ | |
| # else | | # else | |
| # if !defined(XMLSEC_STATIC) | | # if !defined(XMLSEC_STATIC) | |
| | | | |
| skipping to change at line 70 | | skipping to change at line 79 | |
| # endif | | # endif | |
| # endif | | # endif | |
| /* This holds on all other platforms/compilers, which are easier to | | /* This holds on all other platforms/compilers, which are easier to | |
| handle in regard to this. */ | | handle in regard to this. */ | |
| # else | | # else | |
| # define XMLSEC_CRYPTO_EXPORT | | # define XMLSEC_CRYPTO_EXPORT | |
| # endif | | # endif | |
| #endif | | #endif | |
| | | | |
| #if !defined XMLSEC_EXPORT_VAR | | #if !defined XMLSEC_EXPORT_VAR | |
|
| # if defined _MSC_VER | | # if defined(_WIN32) | |
| /* if we compile libxmlsec itself: */ | | /* if we compile libxmlsec itself: */ | |
| # if defined(IN_XMLSEC) | | # if defined(IN_XMLSEC) | |
| # if !defined(XMLSEC_STATIC) | | # if !defined(XMLSEC_STATIC) | |
| # define XMLSEC_EXPORT_VAR __declspec(dllexport) extern | | # define XMLSEC_EXPORT_VAR __declspec(dllexport) extern | |
| # else | | # else | |
| # define XMLSEC_EXPORT_VAR extern | | # define XMLSEC_EXPORT_VAR extern | |
| # endif | | # endif | |
| /* if we compile libxmlsec-crypto itself: */ | | /* if we compile libxmlsec-crypto itself: */ | |
| # elif defined(IN_XMLSEC_CRYPTO) | | # elif defined(IN_XMLSEC_CRYPTO) | |
| # define XMLSEC_EXPORT_VAR extern | | # define XMLSEC_EXPORT_VAR extern | |
| | | | |
End of changes. 5 change blocks. |
| 3 lines changed or deleted | | 12 lines changed or added | |
|