diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2013-02-16 17:31:22 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2013-02-16 17:31:22 +0000 |
| commit | c03ca9c73c15b893d5e952207224e3e339b5bbd6 (patch) | |
| tree | 346df92cd31438c8c7d8848fd56a99410ab8dedd /src | |
| parent | d5884afcf36c567a713fc0ee33e905e5361f6eaf (diff) | |
[trunk] rename deprecated macro with opj_ prefix and use it for opj_stream_destroy function
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/openjp2/openjpeg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h index e2657ae4..2b6c4518 100644 --- a/src/lib/openjp2/openjpeg.h +++ b/src/lib/openjp2/openjpeg.h @@ -47,10 +47,10 @@ #ifdef __GNUC__ #define DEPRECATED(func) func __attribute__ ((deprecated)) #elif defined(_MSC_VER) - #define DEPRECATED(func) __declspec(deprecated) func + #define OPJ_DEPRECATED(func) __declspec(deprecated) func #else #pragma message("WARNING: You need to implement DEPRECATED for this compiler") - #define DEPRECATED(func) func + #define OPJ_DEPRECATED(func) func #endif #if defined(OPJ_STATIC) || !defined(_WIN32) @@ -1004,7 +1004,7 @@ OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_SIZE_T p_buffer_size, O * * @param p_stream the stream to destroy. */ -OPJ_API void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream); +OPJ_DEPRECATED(OPJ_API void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream)); OPJ_API void OPJ_CALLCONV opj_stream_destroy_v3(opj_stream_t* p_stream); /** |