openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker.diff of Package libdlm (Revision 7963a8856735a6923d3c81c8254ebca7)

Currently displaying revision 7963a8856735a6923d3c81c8254ebca7 , Show latest

diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -45,7 +45,7 @@ endif
 CFLAGS += -I${incdir}
 
 LDFLAGS += -L${dlmlibdir} -ldlm 
-LDFLAGS += -L${logtlibdir} -llogthread
+#LDFLAGS += -L${logtlibdir} -llogthread
 LDFLAGS += -L${openaislibdir} -lSaCkpt
 LDFLAGS += -L${corosynclibdir} -lcpg
 LDFLAGS += -L${libdir}
diff --git a/group/dlm_controld/dlm_daemon.h b/group/dlm_controld/dlm_daemon.h
--- a/group/dlm_controld/dlm_daemon.h
+++ b/group/dlm_controld/dlm_daemon.h
@@ -33,8 +33,13 @@
 #include <openais/saAis.h>
 #include <openais/saCkpt.h>
 
+#ifdef ENABLE_PACEMAKER
+#include <openais/cpg.h>
+#define logt_print(level, format, args...) syslog(level, "%s: " format "\n", __FUNCTION__, ##args)
+#else
 #include <corosync/cpg.h>
 #include <liblogthread.h>
+#endif
 
 #include <linux/dlmconstants.h>
 #include "libdlmcontrol.h"
diff --git a/group/dlm_controld/pacemaker.c b/group/dlm_controld/pacemaker.c
--- a/group/dlm_controld/pacemaker.c
+++ b/group/dlm_controld/pacemaker.c
@@ -99,7 +99,7 @@ void close_cluster(void) {
 }
 
 #include <arpa/inet.h>
-#include <corosync/totem/totemip.h>
+#include <openais/totem/totemip.h>
 
 void dlm_process_node(gpointer key, gpointer value, gpointer user_data)
 {

Places

File pacemaker.diff of Package libdlm (Revision 7963a8856735a6923d3c81c8254ebca7)

Places