In trunk, totemip.h and totem.h call for "../include/swab.h" - this works fine

when building openais itself but causes problems when installed as those files
will not be in the right place.

So, I've moved these includes out of totemip.h and totem.h and into the .c files
that call them.


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1370 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/clm.c

@@ -57,6 +57,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include "swab.h"
 #include "totem.h"
 #include "../include/saAis.h"
 #include "../include/saClm.h"

exec/evs.c

@@ -49,6 +49,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include "swab.h"
 #include "totem.h"
 #include "../include/saAis.h"
 #include "../include/ipc_gen.h"
@@ -56,7 +57,6 @@
 #include "../include/list.h"
 #include "../include/queue.h"
 #include "../lcr/lcr_comp.h"
-#include "../include/swab.h"
 #include "totempg.h"
 #include "main.h"
 #include "ipc.h"

exec/flow.c

@@ -46,6 +46,7 @@
 #include <assert.h>
 #include <pthread.h>
 
+#include "swab.h"
 #include "flow.h"
 #include "totem.h"
 #include "totempg.h"

exec/ipc.c

@@ -58,6 +58,7 @@
 #include <ucred.h>
 #endif
 
+#include "swab.h"
 #include "../include/saAis.h"
 #include "../include/list.h"
 #include "../include/queue.h"

exec/lck.c

@@ -48,6 +48,7 @@
 #include <signal.h>
 #include <arpa/inet.h>
 
+#include "swab.h"
 #include "service.h"
 #include "../include/saAis.h"
 #include "../include/saLck.h"

exec/main.c

@@ -56,6 +56,7 @@
 #include <sched.h>
 #include <time.h>
 
+#include "swab.h"
 #include "../include/saAis.h"
 #include "../include/list.h"
 #include "../include/queue.h"

exec/print.c

@@ -56,6 +56,7 @@
 #include <stdlib.h>
 #include <pthread.h>
 
+#include "swab.h"
 #include "print.h"
 #include "totemip.h"
 #include "../include/saAis.h"

exec/service.c

@@ -39,6 +39,7 @@
 #include <assert.h>
 
 #include "../lcr/lcr_ifact.h"
+#include "swab.h"
 #include "service.h"
 #include "mainconfig.h"
 #include "util.h"

exec/timer.c

@@ -56,6 +56,7 @@
 #include <sched.h>
 #include <time.h>
 
+#include "swab.h"
 #include "../include/saAis.h"
 #include "../include/list.h"
 #include "../include/queue.h"

exec/totem.h

@@ -36,7 +36,6 @@
 #ifndef TOTEM_H_DEFINED
 #define TOTEM_H_DEFINED
 #include "totemip.h"
-#include "../include/swab.h"
 
 #define MESSAGE_SIZE_MAX	1024*1024 /* (1MB) */
 #define PROCESSOR_COUNT_MAX	384

exec/totemconfig.c

@@ -46,7 +46,8 @@
 #include <arpa/inet.h>
 #include <sys/param.h>
 
-#include "../include/list.h"
+#include "swab.h"
+#include "list.h"
 #include "util.h"
 #include "totem.h"
 #include "totemconfig.h"

exec/totemip.c

@@ -79,8 +79,8 @@
 #define s6_addr16 __u6_addr.__u6_addr16
 #endif
 
-#include "totemip.h"
 #include "swab.h"
+#include "totemip.h"
 
 #define LOCALHOST_IPV4 "127.0.0.1"
 #define LOCALHOST_IPV6 "::1"

exec/totemip.h

@@ -43,8 +43,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include "../include/swab.h"
-
 #ifdef SO_NOSIGPIPE
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0

exec/totemmrp.c

@@ -53,6 +53,7 @@
 #include <sys/time.h>
 #include <sys/poll.h>
 
+#include "swab.h"
 #include "totem.h"
 #include "totemsrp.h"
 #include "aispoll.h"

exec/totemnet.c

@@ -60,6 +60,7 @@
 #include "aispoll.h"
 #include "totemnet.h"
 #include "wthread.h"
+#include "swab.h"
 #include "../include/queue.h"
 #include "../include/sq.h"
 #include "../include/list.h"

exec/totemnet.h

@@ -37,6 +37,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#include "swab.h"
 #include "totem.h"
 #include "aispoll.h"
 

exec/totempg.c

@@ -94,6 +94,7 @@
 #include <pthread.h>
 #include <errno.h>
 
+#include "swab.h"
 #include "../include/hdb.h"
 #include "../include/list.h"
 #include "totempg.h"

exec/totemsrp.c

@@ -73,6 +73,7 @@
 #include <sys/time.h>
 #include <sys/poll.h>
 
+#include "swab.h"
 #include "aispoll.h"
 #include "totemsrp.h"
 #include "totemrrp.h"
@@ -81,7 +82,6 @@
 #include "../include/sq.h"
 #include "../include/list.h"
 #include "../include/hdb.h"
-#include "swab.h"
 
 #include "crypto.h"
 

lib/clm.c

@@ -45,6 +45,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
+#include "../include/swab.h"
 #include "../exec/totem.h"
 #include "../include/saAis.h"
 #include "../include/saClm.h"

lib/evs.c

@@ -46,6 +46,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
+#include "../include/swab.h"
 #include "../exec/totem.h"
 #include "../include/saAis.h"
 #include "../include/evs.h"