diff --git a/include/crm/pengine/common.h b/include/crm/pengine/common.h index ebc5eeb67d..5fe612e505 100644 --- a/include/crm/pengine/common.h +++ b/include/crm/pengine/common.h @@ -1,53 +1,48 @@ /* * 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_PENGINE_COMMON__H # define PCMK__CRM_PENGINE_COMMON__H # include # include # include # include #ifdef __cplusplus extern "C" { #endif typedef struct pe_re_match_data { char *string; int nregs; regmatch_t *pmatch; } pe_re_match_data_t; typedef struct pe_match_data { pe_re_match_data_t *re; GHashTable *params; GHashTable *meta; } pe_match_data_t; typedef struct pe_rsc_eval_data { const char *standard; const char *provider; const char *agent; } pe_rsc_eval_data_t; -typedef struct pe_op_eval_data { - const char *op_name; - guint interval; -} pe_op_eval_data_t; - #ifdef __cplusplus } #endif #if !defined(PCMK_ALLOW_DEPRECATED) || (PCMK_ALLOW_DEPRECATED == 1) #include #endif #endif diff --git a/include/crm/pengine/common_compat.h b/include/crm/pengine/common_compat.h index 800c8ba3ba..0af70955fa 100644 --- a/include/crm/pengine/common_compat.h +++ b/include/crm/pengine/common_compat.h @@ -1,49 +1,54 @@ /* * 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_PENGINE_COMMON_COMPAT__H #define PCMK__CRM_PENGINE_COMMON_COMPAT__H -#include // GHashTable +#include // guint, GHashTable #include // crm_time_t #include // enum rsc_role_e #ifdef __cplusplus extern "C" { #endif /** * \file * \brief Deprecated Pacemaker shared API for scheduler and rules * \ingroup pengine * \deprecated Do not include this header directly. The APIs in this * header, and the header itself, will be removed in a future * release. */ //!@{ //! \deprecated Use pcmk_rule_input_t instead +typedef struct pe_op_eval_data { + const char *op_name; + guint interval; +} pe_op_eval_data_t; + typedef struct pe_rule_eval_data { GHashTable *node_hash; enum rsc_role_e role; crm_time_t *now; pe_match_data_t *match_data; pe_rsc_eval_data_t *rsc_data; pe_op_eval_data_t *op_data; } pe_rule_eval_data_t; //!@} #ifdef __cplusplus } #endif #endif // PCMK__CRM_PENGINE_COMMON_COMPAT__H