diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 13:39:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 13:39:29 +0000 |
| commit | b41961d74fe7ff2d4d4abaca92454e87c561e49f (patch) | |
| tree | b34e3826a7b649dafdbd05081140c990c96d736d /include/crm/cib.h | |
| parent | Releasing progress-linux version 2.1.7-1~progress7.99u1. (diff) | |
| download | pacemaker-b41961d74fe7ff2d4d4abaca92454e87c561e49f.tar.xz pacemaker-b41961d74fe7ff2d4d4abaca92454e87c561e49f.zip | |
Merging upstream version 2.1.8~rc1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'include/crm/cib.h')
| -rw-r--r-- | include/crm/cib.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/crm/cib.h b/include/crm/cib.h index a93bfde..fe04d91 100644 --- a/include/crm/cib.h +++ b/include/crm/cib.h @@ -1,5 +1,5 @@ /* - * Copyright 2004-2019 the Pacemaker project contributors + * Copyright 2004-2024 the Pacemaker project contributors * * The version control history for this file may have further details. * @@ -26,14 +26,14 @@ extern "C" { * \ingroup cib */ +// Use compare_version() for doing comparisons # define CIB_FEATURE_SET "2.0" -/* use compare_version() for doing comparisons */ - -#define T_CIB_DIFF_NOTIFY "cib_diff_notify" - /* Core functions */ + +// NOTE: sbd (as of at least 1.5.2) uses this cib_t *cib_new(void); + cib_t *cib_native_new(void); cib_t *cib_file_new(const char *filename); cib_t *cib_remote_new(const char *server, const char *user, const char *passwd, int port, @@ -45,6 +45,8 @@ cib_t *cib_shadow_new(const char *name); void cib_free_notify(cib_t *cib); void cib_free_callbacks(cib_t *cib); + +// NOTE: sbd (as of at least 1.5.2) uses this void cib_delete(cib_t * cib); void cib_dump_pending_callbacks(void); @@ -53,6 +55,10 @@ void remove_cib_op_callback(int call_id, gboolean all_callbacks); # define CIB_LIBRARY "libcib.so.27" +#if !defined(PCMK_ALLOW_DEPRECATED) || (PCMK_ALLOW_DEPRECATED == 1) +#include <crm/cib_compat.h> +#endif + #ifdef __cplusplus } #endif |