Rename subsystem_DEPRECATED to subsystem_DEPRECATED_FUNCTION(X)
Start to explain what the replacement function is. Generate the #define/#undef logic in generated header files. Use gcc style where the deprecation warning is after the prototype.
This commit is contained in:
@@ -31,8 +31,6 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/* $Id$ */
|
||||
|
||||
#ifndef GSSAPI_GSSAPI_H_
|
||||
#define GSSAPI_GSSAPI_H_
|
||||
|
||||
@@ -55,13 +53,11 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef GSSAPI_DEPRECATED
|
||||
#ifndef GSSAPI_DEPRECATED_FUNCTION
|
||||
#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 )))
|
||||
#define GSSAPI_DEPRECATED __attribute__((deprecated))
|
||||
#elif defined(_MSC_VER)
|
||||
#define GSSAPI_DEPRECATED __declspec(deprecated)
|
||||
#define GSSAPI_DEPRECATED_FUNCTION(X) __attribute__((deprecated))
|
||||
#else
|
||||
#define GSSAPI_DEPRECATED
|
||||
#define GSSAPI_DEPRECATED_FUNCTION(X)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -875,23 +871,23 @@ gss_context_query_attributes(OM_uint32 * /* minor_status */,
|
||||
* obsolete versions of these routines and their current forms.
|
||||
*/
|
||||
|
||||
GSSAPI_DEPRECATED GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_sign
|
||||
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_sign
|
||||
(OM_uint32 * /*minor_status*/,
|
||||
gss_ctx_id_t /*context_handle*/,
|
||||
int /*qop_req*/,
|
||||
gss_buffer_t /*message_buffer*/,
|
||||
gss_buffer_t /*message_token*/
|
||||
);
|
||||
) GSSAPI_DEPRECATED_FUNCTION("Use gss_get_mic");
|
||||
|
||||
GSSAPI_DEPRECATED GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_verify
|
||||
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_verify
|
||||
(OM_uint32 * /*minor_status*/,
|
||||
gss_ctx_id_t /*context_handle*/,
|
||||
gss_buffer_t /*message_buffer*/,
|
||||
gss_buffer_t /*token_buffer*/,
|
||||
int * /*qop_state*/
|
||||
);
|
||||
) GSSAPI_DEPRECATED_FUNCTION("Use gss_verify_mic");
|
||||
|
||||
GSSAPI_DEPRECATED GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_seal
|
||||
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_seal
|
||||
(OM_uint32 * /*minor_status*/,
|
||||
gss_ctx_id_t /*context_handle*/,
|
||||
int /*conf_req_flag*/,
|
||||
@@ -899,16 +895,16 @@ GSSAPI_DEPRECATED GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_seal
|
||||
gss_buffer_t /*input_message_buffer*/,
|
||||
int * /*conf_state*/,
|
||||
gss_buffer_t /*output_message_buffer*/
|
||||
);
|
||||
) GSSAPI_DEPRECATED_FUNCTION("Use gss_wrap");
|
||||
|
||||
GSSAPI_DEPRECATED GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_unseal
|
||||
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_unseal
|
||||
(OM_uint32 * /*minor_status*/,
|
||||
gss_ctx_id_t /*context_handle*/,
|
||||
gss_buffer_t /*input_message_buffer*/,
|
||||
gss_buffer_t /*output_message_buffer*/,
|
||||
int * /*conf_state*/,
|
||||
int * /*qop_state*/
|
||||
);
|
||||
) GSSAPI_DEPRECATED_FUNCTION("Use gss_unwrap");
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -1126,4 +1122,6 @@ gss_name_to_oid(const char *name);
|
||||
|
||||
GSSAPI_CPP_END
|
||||
|
||||
#undef GSSAPI_DEPRECATED_FUNCTION
|
||||
|
||||
#endif /* GSSAPI_GSSAPI_H_ */
|
||||
|
Reference in New Issue
Block a user