Просмотр исходного кода

Rename aispoll to coropoll.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1595 fd59a12c-fef9-0310-b244-a6a79926bd2f
Steven Dake 17 лет назад
Родитель
Сommit
9306666d70

+ 3 - 3
corosync/exec/Makefile

@@ -52,8 +52,8 @@ ifeq (${OPENAIS_COMPAT}, SOLARIS)
 endif
 
 # Totem objects
-TOTEM_SRC = aispoll.c totemip.c totemnet.c totemrrp.c totemsrp.c totemmrp.c totempg.c crypto.c wthread.c
-TOTEM_OBJS = aispoll.o totemip.o totemnet.o totemrrp.o totemsrp.o totemmrp.o totempg.o crypto.o wthread.o
+TOTEM_SRC = coropoll.c totemip.c totemnet.c totemrrp.c totemsrp.c totemmrp.c totempg.c crypto.c wthread.c
+TOTEM_OBJS = coropoll.o totemip.o totemnet.o totemrrp.o totemsrp.o totemmrp.o totempg.o crypto.o wthread.o
 LOGSYS_SRC = wthread.c logsys.c
 LOGSYS_OBJS = wthread.o logsys.o
 
@@ -152,7 +152,7 @@ objdb.o: objdb.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 # -fPIC rules required for lib totem
-aispoll.o: aispoll.c
+coropoll.o: coropoll.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $<
 
 totempg.o: totempg.c

+ 1 - 1
corosync/exec/aispoll.c → corosync/exec/coropoll.c

@@ -39,7 +39,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "aispoll.h"
+#include "coropoll.h"
 #include "../include/list.h"
 #include "../include/hdb.h"
 #include "tlist.h"

+ 0 - 0
corosync/exec/aispoll.h → corosync/exec/coropoll.h


+ 1 - 1
corosync/exec/main.c

@@ -61,7 +61,7 @@
 #include "../include/list.h"
 #include "../include/queue.h"
 #include "../lcr/lcr_ifact.h"
-#include "poll.h"
+#include "coropoll.h"
 #include "totempg.h"
 #include "totemsrp.h"
 #include "mempool.h"

+ 1 - 0
corosync/exec/main.h

@@ -37,6 +37,7 @@
 #define FALSE 0
 #include "../include/saAis.h"
 #include "../include/ipc_gen.h"
+#include "coropoll.h"
 #include "objdb.h"
 #include "config.h"
 #include "totempg.h"

+ 1 - 1
corosync/exec/totemconfig.h

@@ -35,7 +35,7 @@
 #include <netinet/in.h>
 #include "../include/saAis.h"
 #include "../include/list.h"
-#include "aispoll.h"
+#include "coropoll.h"
 #include "totemsrp.h"
 #include "totempg.h"
 #include "objdb.h"

+ 1 - 1
corosync/exec/totemmrp.c

@@ -56,7 +56,7 @@
 
 #include "totem.h"
 #include "totemsrp.h"
-#include "aispoll.h"
+#include "coropoll.h"
 
 totemsrp_handle totemsrp_handle_in;
 

+ 0 - 1
corosync/exec/totemmrp.h

@@ -36,7 +36,6 @@
 #define TOTEMMRP_H_DEFINED
 
 #include "totem.h"
-#include "aispoll.h"
 
 /*
  * Totem Single Ring Protocol

+ 1 - 1
corosync/exec/totemnet.c

@@ -57,7 +57,7 @@
 #include <sys/time.h>
 #include <sys/poll.h>
 
-#include "aispoll.h"
+#include "coropoll.h"
 #include "totemnet.h"
 #include "wthread.h"
 #include "../include/queue.h"

+ 0 - 1
corosync/exec/totemnet.h

@@ -39,7 +39,6 @@
 #include <sys/socket.h>
 
 #include "totem.h"
-#include "aispoll.h"
 
 typedef unsigned int totemnet_handle;
 

+ 1 - 0
corosync/exec/totempg.c

@@ -94,6 +94,7 @@
 
 #include "../include/hdb.h"
 #include "../include/list.h"
+#include "coropoll.h"
 #include "totempg.h"
 #include "totemmrp.h"
 #include "totemsrp.h"

+ 1 - 1
corosync/exec/totempg.h

@@ -37,8 +37,8 @@
 #define TOTEMPG_H_DEFINED
 
 #include <netinet/in.h>
-#include "aispoll.h"
 #include "totem.h"
+#include "coropoll.h"
 
 typedef unsigned int totempg_groups_handle;
 

+ 1 - 1
corosync/exec/totemrrp.c

@@ -62,7 +62,7 @@
 #include "../include/list.h"
 #include "../include/hdb.h"
 #include "swab.h"
-#include "aispoll.h"
+#include "coropoll.h"
 #include "totemnet.h"
 #include "totemrrp.h"
 

+ 0 - 1
corosync/exec/totemrrp.h

@@ -39,7 +39,6 @@
 #include <sys/socket.h>
 
 #include "totem.h"
-#include "aispoll.h"
 
 typedef unsigned int totemrrp_handle;
 

+ 1 - 1
corosync/exec/totemsrp.c

@@ -70,7 +70,7 @@
 #include <sys/time.h>
 #include <sys/poll.h>
 
-#include "aispoll.h"
+#include "coropoll.h"
 #include "totemsrp.h"
 #include "totemrrp.h"
 #include "wthread.h"

+ 1 - 1
corosync/exec/totemsrp.h

@@ -36,7 +36,7 @@
 #define TOTEMSRP_H_DEFINED
 
 #include "totem.h"
-#include "aispoll.h"
+#include "coropoll.h"
 
 typedef unsigned int totemsrp_handle;