diff --git a/include/crm/common/Makefile.am b/include/crm/common/Makefile.am index 5f916b0792..04a2a1c266 100644 --- a/include/crm/common/Makefile.am +++ b/include/crm/common/Makefile.am @@ -1,48 +1,47 @@ # # 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 General Public License version 2 # or later (GPLv2+) WITHOUT ANY WARRANTY. # MAINTAINERCLEANFILES = Makefile.in headerdir=$(pkgincludedir)/crm/common header_HEADERS = acl.h \ actions.h \ agents.h \ cib.h \ ipc.h \ ipc_controld.h \ ipc_pacemakerd.h \ ipc_schedulerd.h \ iso8601.h \ logging.h \ logging_compat.h \ mainloop.h \ nodes.h \ nvpair.h \ options.h \ output.h \ resources.h \ results.h \ roles.h \ rules.h \ scheduler.h \ scheduler_types.h \ schemas.h \ scores.h \ tags.h \ tickets.h \ util.h \ util_compat.h \ xml.h \ xml_compat.h \ xml_io.h \ - xml_io_compat.h \ xml_names.h noinst_HEADERS = $(wildcard *internal.h) diff --git a/include/crm/common/xml_io.h b/include/crm/common/xml_io.h index a5e454cb8c..b90ba88f82 100644 --- a/include/crm/common/xml_io.h +++ b/include/crm/common/xml_io.h @@ -1,48 +1,44 @@ /* * 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_COMMON_XML_IO__H #define PCMK__CRM_COMMON_XML_IO__H #include // xmlNode #ifdef __cplusplus extern "C" { #endif /** * \file * \brief Wrappers for and extensions to XML input/output functions * \ingroup core */ /* Define compression parameters for IPC messages * * Compression costs a LOT, so we don't want to do it unless we're hitting * message limits. Currently, we use 128KB as the threshold, because higher * values don't play well with the heartbeat stack. With an earlier limit of * 10KB, compressing 184 of 1071 messages accounted for 23% of the total CPU * used by the cib. */ #define CRM_BZ2_BLOCKS 4 #define CRM_BZ2_WORK 20 #define CRM_BZ2_THRESHOLD (128 * 1024) void save_xml_to_file(const xmlNode *xml, const char *desc, const char *filename); -#if !defined(PCMK_ALLOW_DEPRECATED) || (PCMK_ALLOW_DEPRECATED == 1) -#include -#endif - #ifdef __cplusplus } #endif #endif // PCMK__CRM_COMMON_XML_IO__H diff --git a/include/crm/common/xml_io_compat.h b/include/crm/common/xml_io_compat.h deleted file mode 100644 index 80a6d20bd6..0000000000 --- a/include/crm/common/xml_io_compat.h +++ /dev/null @@ -1,32 +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_COMMON_XML_IO_COMPAT__H -#define PCMK__CRM_COMMON_XML_IO_COMPAT__H - -#include // xmlNode - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file - * \brief Deprecated Pacemaker XML I/O API - * \ingroup core - * \deprecated Do not include this header directly. The XML APIs in this - * header, and the header itself, will be removed in a future - * release. - */ - -#ifdef __cplusplus -} -#endif - -#endif // PCMK__CRM_COMMON_XML_IO_COMPAT__H