diff --git a/include/crm/pengine/Makefile.am b/include/crm/pengine/Makefile.am index 77bc28e91f..52e48240ed 100644 --- a/include/crm/pengine/Makefile.am +++ b/include/crm/pengine/Makefile.am @@ -1,23 +1,22 @@ # # Copyright 2006-2024 the Pacemaker project contributors # # The version control history for this file may have further details. # # This source code is licensed under the GNU General Public License version 2 # or later (GPLv2+) WITHOUT ANY WARRANTY. # MAINTAINERCLEANFILES = Makefile.in headerdir=$(pkgincludedir)/crm/pengine noinst_HEADERS = internal.h \ $(wildcard *_internal.h) header_HEADERS = common.h \ complex.h \ pe_types.h \ rules.h \ status.h \ - common_compat.h \ pe_types_compat.h \ rules_compat.h \ status_compat.h diff --git a/include/crm/pengine/common.h b/include/crm/pengine/common.h index 57005e1047..c1048c8e69 100644 --- a/include/crm/pengine/common.h +++ b/include/crm/pengine/common.h @@ -1,62 +1,58 @@ /* * 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; typedef struct pe_rule_eval_data { GHashTable *node_hash; // Only used with g_hash_table_lookup() enum rsc_role_e role; //!< \deprecated Ignored crm_time_t *now; // @COMPAT could be const pe_match_data_t *match_data; // @COMPAT could be const pe_rsc_eval_data_t *rsc_data; // @COMPAT could be const pe_op_eval_data_t *op_data; // @COMPAT could be const } pe_rule_eval_data_t; -#if !defined(PCMK_ALLOW_DEPRECATED) || (PCMK_ALLOW_DEPRECATED == 1) -#include -#endif - #ifdef __cplusplus } #endif #endif diff --git a/include/crm/pengine/common_compat.h b/include/crm/pengine/common_compat.h deleted file mode 100644 index 89ce7c9bdf..0000000000 --- a/include/crm/pengine/common_compat.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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 - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file - * \brief Deprecated Pacemaker scheduler utilities - * \ingroup pengine - * \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 (pcmk_role_promoted + 1) instead -#define RSC_ROLE_MAX (pcmk_role_promoted + 1) - -#ifdef __cplusplus -} -#endif - -#endif // PCMK__CRM_PENGINE_COMMON_COMPAT__H