diff --git a/include/crm/crm_compat.h b/include/crm/crm_compat.h index a5f2b6e8dd..c53ebc5400 100644 --- a/include/crm/crm_compat.h +++ b/include/crm/crm_compat.h @@ -1,220 +1,42 @@ /* * Copyright 2004-2024 the Pacemaker project contributors * * The version control history for this file may have further details. * * This source code is licensed under the GNU Lesser General Public License * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY. */ #ifndef PCMK__CRM_CRM_COMPAT__H -# define PCMK__CRM_CRM_COMPAT__H +#define PCMK__CRM_CRM_COMPAT__H -#include -#include +#include // GList -#include -#include +#include // PCMK_SCORE_INFINITY #ifdef __cplusplus extern "C" { #endif /** * \file * \brief Deprecated Pacemaker utilities * \ingroup core * \deprecated Do not include this header directly. The utilities in this * header, and the header itself, will be removed in a future * release. */ -//! \deprecated Use '\0' instead -#define EOS '\0' - -//! \deprecated This defined constant will be removed in a future release -#define MAX_IPC_DELAY 120 - // NOTE: sbd (as of at least 1.5.2) uses this //! \deprecated Use PCMK_SCORE_INFINITY instead #define CRM_SCORE_INFINITY PCMK_SCORE_INFINITY -/* INFINITY might be defined elsewhere (such as math.h), so undefine it first. - * This, of course, complicates any attempt to use the other definition in any - * code that includes this header. - */ -//! \deprecated Use PCMK_SCORE_INFINITY instead -#undef INFINITY -#define INFINITY PCMK_SCORE_INFINITY - -//! \deprecated Use PCMK_VALUE_INFINITY instead -#define CRM_INFINITY_S PCMK_VALUE_INFINITY - -//! \deprecated Use PCMK_VALUE_MINUS_INFINITY instead -#define CRM_MINUS_INFINITY_S PCMK_VALUE_MINUS_INFINITY - -//! \deprecated Use PCMK_VALUE_PLUS_INFINITY instead -#define CRM_PLUS_INFINITY_S PCMK_VALUE_PLUS_INFINITY - -//! \deprecated Use PCMK_VALUE_INFINITY instead -#define INFINITY_S "INFINITY" - -//! \deprecated Use PCMK_VALUE_MINUS_INFINITY instead -#define MINUS_INFINITY_S "-INFINITY" - -//! \deprecated Use PCMK_ACTION_STONITH instead -#define CRM_OP_FENCE PCMK_ACTION_STONITH - -//! \deprecated This defined constant will be removed in a future release -#define CRM_OP_LRM_QUERY "lrm_query" - -//! \deprecated Use PCMK_ACTION_CLONE_ONE_OR_MORE instead -#define CRM_OP_RELAXED_CLONE PCMK_ACTION_CLONE_ONE_OR_MORE - -//! \deprecated Use PCMK_ACTION_ONE_OR_MORE instead -#define CRM_OP_RELAXED_SET PCMK_ACTION_ONE_OR_MORE - -//! \deprecated This defined constant will be removed in a future release -#define CRM_ATTR_RA_VERSION "#ra-version" - -//! \deprecated Use PCMK_ACTION_CANCEL instead -#define CRMD_ACTION_CANCEL PCMK_ACTION_CANCEL - -//! \deprecated Use PCMK_ACTION_DELETE instead -#define CRMD_ACTION_DELETE PCMK_ACTION_DELETE - -//! \deprecated Use PCMK_ACTION_DEMOTE instead -#define CRMD_ACTION_DEMOTE PCMK_ACTION_DEMOTE - -//! \deprecated Use PCMK_ACTION_DEMOTED instead -#define CRMD_ACTION_DEMOTED PCMK_ACTION_DEMOTED - -//! \deprecated Use PCMK_ACTION_META_DATA instead -#define CRMD_ACTION_METADATA PCMK_ACTION_META_DATA - -//! \deprecated Use PCMK_ACTION_MIGRATE_TO instead -#define CRMD_ACTION_MIGRATE PCMK_ACTION_MIGRATE_TO - -//! \deprecated Use PCMK_ACTION_MIGRATE_FROM instead -#define CRMD_ACTION_MIGRATED PCMK_ACTION_MIGRATE_FROM - -//! \deprecated Use PCMK_ACTION_NOTIFIED instead -#define CRMD_ACTION_NOTIFIED PCMK_ACTION_NOTIFIED - -//! \deprecated Use PCMK_ACTION_NOTIFY instead -#define CRMD_ACTION_NOTIFY PCMK_ACTION_NOTIFY - -//! \deprecated Use PCMK_ACTION_PROMOTE instead -#define CRMD_ACTION_PROMOTE PCMK_ACTION_PROMOTE - -//! \deprecated Use PCMK_ACTION_PROMOTED instead -#define CRMD_ACTION_PROMOTED PCMK_ACTION_PROMOTED - -//! \deprecated Use PCMK_ACTION_RELOAD instead -#define CRMD_ACTION_RELOAD PCMK_ACTION_RELOAD - -//! \deprecated Use PCMK_ACTION_RELOAD_AGENT instead -#define CRMD_ACTION_RELOAD_AGENT PCMK_ACTION_RELOAD_AGENT - -//! \deprecated Use PCMK_ACTION_START instead -#define CRMD_ACTION_START PCMK_ACTION_START - -//! \deprecated Use PCMK_ACTION_RUNNING instead -#define CRMD_ACTION_STARTED PCMK_ACTION_RUNNING - -//! \deprecated Use PCMK_ACTION_MONITOR instead -#define CRMD_ACTION_STATUS PCMK_ACTION_MONITOR - -//! \deprecated Use PCMK_ACTION_STOP instead -#define CRMD_ACTION_STOP PCMK_ACTION_STOP - -//! \deprecated Use PCMK_ACTION_STOPPED instead -#define CRMD_ACTION_STOPPED PCMK_ACTION_STOPPED - -//! \deprecated Do not use -#define CRMD_METADATA_CALL_TIMEOUT PCMK_DEFAULT_METADATA_TIMEOUT_MS - -//! \deprecated Use PCMK_ACTION_CANCEL instead -#define RSC_CANCEL PCMK_ACTION_CANCEL - -//! \deprecated Use PCMK_ACTION_DELETE instead -#define RSC_DELETE PCMK_ACTION_DELETE - -//! \deprecated Use PCMK_ACTION_DEMOTE instead -#define RSC_DEMOTE PCMK_ACTION_DEMOTE - -//! \deprecated Use PCMK_ACTION_DEMOTED instead -#define RSC_DEMOTED PCMK_ACTION_DEMOTED - -//! \deprecated Use PCMK_ACTION_META_DATA instead -#define RSC_METADATA PCMK_ACTION_META_DATA - -//! \deprecated Use PCMK_ACTION_MIGRATE_TO instead -#define RSC_MIGRATE PCMK_ACTION_MIGRATE_TO - -//! \deprecated Use PCMK_ACTION_MIGRATE_FROM instead -#define RSC_MIGRATED PCMK_ACTION_MIGRATE_FROM - -//! \deprecated Use PCMK_ACTION_NOTIFIED instead -#define RSC_NOTIFIED PCMK_ACTION_NOTIFIED - -//! \deprecated Use PCMK_ACTION_NOTIFY instead -#define RSC_NOTIFY PCMK_ACTION_NOTIFY - -//! \deprecated Use PCMK_ACTION_PROMOTE instead -#define RSC_PROMOTE PCMK_ACTION_PROMOTE - -//! \deprecated Use PCMK_ACTION_PROMOTED instead -#define RSC_PROMOTED PCMK_ACTION_PROMOTED - -//! \deprecated Use PCMK_ACTION_START instead -#define RSC_START PCMK_ACTION_START - -//! \deprecated Use PCMK_ACTION_RUNNING instead -#define RSC_STARTED PCMK_ACTION_RUNNING - -//! \deprecated Use PCMK_ACTION_MONITOR instead -#define RSC_STATUS PCMK_ACTION_MONITOR - -//! \deprecated Use PCMK_ACTION_STOP instead -#define RSC_STOP PCMK_ACTION_STOP - -//! \deprecated Use PCMK_ACTION_STOPPED instead -#define RSC_STOPPED PCMK_ACTION_STOPPED - -//! \deprecated Do not use -#define CRM_OP_LOCAL_SHUTDOWN "start_shutdown" - -//!@{ -//! \deprecated This macro will be removed in a future release - -# ifndef __GNUC__ -# define __builtin_expect(expr, result) (expr) -# endif - -#define __likely(expr) __builtin_expect(expr, 1) - -#define __unlikely(expr) __builtin_expect(expr, 0) - -// This ends the doxygen deprecation comment -//!@} - // NOTE: sbd (as of at least 1.5.2) uses this //! \deprecated Use GList * instead typedef GList *GListPtr; -//! \deprecated Do not use -static inline const char * -crm_action_str(const char *task, guint interval_ms) { - if ((task != NULL) && (interval_ms == 0) - && (strcasecmp(task, PCMK_ACTION_MONITOR) == 0)) { - return "probe"; - } - return task; -} - #ifdef __cplusplus } #endif #endif // PCMK__CRM_CRM_COMPAT__H