enhancement 813

Rename ais_types.h header file to be more compliant with sa forum


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

exec/Makefile

@@ -115,49 +115,49 @@ totemconfig.o: totemconfig.c
 
 # DO NOT DELETE
 
-main.o: ../include/ais_types.h ../include/ipc_evs.h ../include/ais_types.h
+main.o: ../include/saAis.h ../include/ipc_evs.h ../include/saAis.h
 main.o: evs.h ../include/saClm.h ../include/ipc_gen.h ../include/list.h
 main.o: ../include/queue.h totempg.h aispoll.h totemsrp.h mempool.h mainparse.h
 main.o: main.h clm.h ../include/saClm.h amf.h handlers.h ckpt.h evt.h hdb.h
 main.o: ../include/saEvt.h swab.h print.h
-clm.o: ../include/ais_types.h ../include/saClm.h ../include/ais_types.h
+clm.o: ../include/saAis.h ../include/saClm.h ../include/saAis.h
 clm.o: ../include/ipc_evs.h evs.h ../include/saClm.h ../include/ipc_gen.h
 clm.o: ../include/ipc_clm.h ../include/list.h ../include/queue.h aispoll.h
 clm.o: totempg.h totemsrp.h mainparse.h main.h clm.h amf.h handlers.h ckpt.h
 clm.o: evt.h hdb.h ../include/saEvt.h mempool.h print.h
-amf.o: ../include/ais_types.h ../include/ipc_evs.h ../include/ais_types.h
+amf.o: ../include/saAis.h ../include/ipc_evs.h ../include/saAis.h
 amf.o: evs.h ../include/saClm.h ../include/ipc_gen.h ../include/list.h
 amf.o: ../include/queue.h totempg.h aispoll.h totemsrp.h mempool.h util.h
 amf.o: mainparse.h main.h clm.h ../include/saClm.h amf.h handlers.h ckpt.h evt.h
 amf.o: hdb.h ../include/saEvt.h print.h
-ckpt.o: ../include/ais_types.h ../include/ipc_evs.h ../include/ais_types.h
+ckpt.o: ../include/saAis.h ../include/ipc_evs.h ../include/saAis.h
 ckpt.o: evs.h ../include/saClm.h ../include/ipc_gen.h ../include/list.h
 ckpt.o: ../include/queue.h aispoll.h mempool.h util.h mainparse.h totempg.h
 ckpt.o: totemsrp.h main.h clm.h ../include/saClm.h amf.h handlers.h ckpt.h
 ckpt.o: evt.h hdb.h ../include/saEvt.h print.h
-evt.o: ../include/ipc_evt.h ../include/ais_types.h ../include/saEvt.h
+evt.o: ../include/ipc_evt.h ../include/saAis.h ../include/saEvt.h
 evt.o: ../include/saClm.h ../include/ipc_gen.h ../include/list.h
-evt.o: ../include/queue.h util.h ../include/ais_types.h aispoll.h mempool.h
+evt.o: ../include/queue.h util.h ../include/saAis.h aispoll.h mempool.h
 evt.o: mainparse.h totempg.h totemsrp.h main.h evs.h clm.h ../include/saClm.h
 evt.o: amf.h ../include/ipc_evs.h handlers.h ckpt.h evt.h hdb.h
 evt.o: ../include/saEvt.h swab.h print.h
-evs.o: ../include/ais_types.h ../include/ipc_evs.h ../include/ais_types.h
+evs.o: ../include/saAis.h ../include/ipc_evs.h ../include/saAis.h
 evs.o: evs.h ../include/saClm.h ../include/ipc_gen.h ../include/list.h
 evs.o: ../include/queue.h aispoll.h totempg.h totemsrp.h mainparse.h main.h clm.h
 evs.o: ../include/saClm.h amf.h handlers.h ckpt.h evt.h hdb.h
 evs.o: ../include/saEvt.h mempool.h print.h
-mainparse.o: ../include/ais_types.h ../include/list.h util.h mainparse.h aispoll.h
+mainparse.o: ../include/saAis.h ../include/list.h util.h mainparse.h aispoll.h
 mainparse.o: totempg.h totemsrp.h mempool.h print.h ../include/saClm.h
-mainparse.o: ../include/ais_types.h
-print.o: print.h ../include/ais_types.h ../include/saClm.h
-print.o: ../include/ais_types.h mainparse.h ../include/list.h aispoll.h totempg.h
+mainparse.o: ../include/saAis.h
+print.o: print.h ../include/saAis.h ../include/saClm.h
+print.o: ../include/saAis.h mainparse.h ../include/list.h aispoll.h totempg.h
 print.o: totemsrp.h
 mempool.o: ../include/list.h mempool.h
-util.o: ../include/ais_types.h ../include/list.h util.h
-aispoll.o: aispoll.h ../include/list.h hdb.h ../include/ais_types.h tlist.h
+util.o: ../include/saAis.h ../include/list.h util.h
+aispoll.o: aispoll.h ../include/list.h hdb.h ../include/saAis.h tlist.h
 totemsrp.o: aispoll.h totemsrp.h ../include/queue.h ../include/sq.h
-totemsrp.o: ../include/list.h hdb.h ../include/ais_types.h swab.h crypto.h
+totemsrp.o: ../include/list.h hdb.h ../include/saAis.h swab.h crypto.h
 totempg.o: totempg.h aispoll.h totemsrp.h swab.h
 tlist.o: ../include/list.h tlist.h
-hdb.o: hdb.h ../include/ais_types.h
+hdb.o: hdb.h ../include/saAis.h
 crypto.o: crypto.h

exec/aispoll.c

@@ -41,7 +41,7 @@
 #include "aispoll.h"
 #include "../include/list.h"
 #include "hdb.h"
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "tlist.h"
 
 typedef int (*dispatch_fn_t) (poll_handle poll_handle, int fd, int revents, void *data, unsigned int *prio);

exec/amf.c

@@ -45,7 +45,7 @@
 #include <signal.h>
 #include <string.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/ipc_gen.h"
 #include "../include/ipc_amf.h"
 #include "../include/list.h"

exec/ckpt.c

@@ -45,7 +45,7 @@
 #include <signal.h>
 #include <arpa/inet.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saCkpt.h"
 #include "../include/ipc_ckpt.h"
 #include "../include/list.h"

exec/ckpt.h

@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saCkpt.h"
 #include "aispoll.h"
 #include "totemsrp.h"

exec/clm.c

@@ -51,7 +51,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saClm.h"
 #include "../include/ipc_gen.h"
 #include "../include/ipc_clm.h"

exec/clm.h

@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saClm.h"
 
 #ifndef CLM_H_DEFINED

exec/evs.c

@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/ipc_gen.h"
 #include "../include/ipc_evs.h"
 #include "../include/list.h"

exec/evs.h

@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 
 #ifndef EVS_H_DEFINED
 #define EVS_H_DEFINED

exec/hdb.h

@@ -35,7 +35,7 @@
 #ifndef HDB_H_DEFINED
 #define HDB_H_DEFINED
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 
 struct saHandleDatabase {
 	unsigned int handleCount;

exec/main.c

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

exec/main.h

@@ -35,7 +35,7 @@
 #define TRUE 1
 #define FALSE 0
 #include <sys/un.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/queue.h"
 #include "poll.h"
 #include "evs.h"

exec/mainparse.c

@@ -40,7 +40,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "util.h"
 #include "mainparse.h"

exec/mainparse.h

@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <netinet/in.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "aispoll.h"
 #include "totemsrp.h"

exec/print.c

@@ -43,7 +43,7 @@
 
 
 #include "print.h"
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 
 unsigned int logmode = LOG_MODE_STDERR | LOG_MODE_SYSLOG;
 char *logfile = 0;

exec/print.h

@@ -34,7 +34,7 @@
 #ifndef PRINT_H_DEFINED
 #define PRINT_H_DEFINED
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saClm.h"
 
 #define LOG_MODE_DEBUG		1

exec/sync.c

@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "main.h"
 #include "sync.h"
 #include "totempg.h"

exec/totemconfig.h

@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <netinet/in.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "aispoll.h"
 #include "totemsrp.h"

exec/totemparse.h

@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <netinet/in.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "aispoll.h"
 #include "totemsrp.h"

exec/util.c

@@ -38,7 +38,7 @@
 #include <errno.h>
 #include <sys/time.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "util.h"
 

exec/util.h

@@ -35,7 +35,7 @@
 #ifndef UTIL_H_DEFINED
 #define UTIL_H_DEFINED
 #include <sys/time.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 
 /*
  * Compare two names.  returns non-zero on match.

include/ais_amf.h

@@ -35,7 +35,7 @@
 #ifndef AIS_AMF_H_DEFINED
 #define AIS_AMF_H_DEFINED
 
-#include "ais_types.h"
+#include "saAis.h"
 
 typedef void (*SaAmfHealthcheckCallbackT) (
 	SaInvocationT invocation,

include/ipc_amf.h

@@ -36,7 +36,7 @@
 
 #include <netinet/in.h>
 #include "ipc_gen.h"
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 enum req_amf_response_interfaces {

include/ipc_ckpt.h

@@ -34,7 +34,7 @@
 #ifndef IPC_CKPT_H_DEFINED
 #define IPC_CKPT_H_DEFINED
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 #include "ipc_gen.h"
 

include/ipc_clm.h

@@ -35,7 +35,7 @@
 #define IPC_CLM_H_DEFINED
 
 #include <netinet/in.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saClm.h"
 #include "ipc_gen.h"
 

include/ipc_evs.h

@@ -35,7 +35,7 @@
 #define IPC_EVS_H_DEFINED
 
 #include <netinet/in.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "evs.h"
 #include "ipc_gen.h"
 

include/ipc_evt.h

@@ -35,7 +35,7 @@
 #define IPC_EVT_H_DEFINED
 
 #include <netinet/in.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 #include "saClm.h"
 #include "ipc_gen.h"

include/ais_types.h → include/saAis.h

@@ -74,8 +74,8 @@ typedef struct {
 
 typedef struct {
 	char releaseCode;
-	unsigned char major;
-	unsigned char minor;
+	unsigned char majorVersion;
+	unsigned char minorVersion;
 } SaVersionT;
 
 #define SA_TRACK_CURRENT 0x01

include/saClm.h

@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ais_types.h"
+#include "saAis.h"
 
 #ifndef AIS_CLM_H_DEFINED
 #define AIS_CLM_H_DEFINED

include/saEvt.h

@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ais_types.h"
+#include "saAis.h"
 
 #ifndef AIS_EVT_H_DEFINED
 #define AIS_EVT_H_DEFINED
@@ -57,8 +57,8 @@ typedef void
 );
 
 typedef struct{
-    const SaEvtChannelOpenCallbackT saEvtChannelOpenCallback;
-    const SaEvtEventDeliverCallbackT saEvtEventDeliverCallback; 
+    SaEvtChannelOpenCallbackT saEvtChannelOpenCallback;
+    SaEvtEventDeliverCallbackT saEvtEventDeliverCallback; 
 } SaEvtCallbacksT;
 
 #define SA_EVT_CHANNEL_PUBLISHER  0X1

lib/Makefile

@@ -119,18 +119,18 @@ depend:
 	makedepend -Y -- $(CFLAGS) $(LIBAIS_SRC) > /dev/null 2>&1
 # DO NOT DELETE
 
-util.o: ../include/ais_types.h ../include/ipc_evs.h ../include/ais_types.h
+util.o: ../include/saAis.h ../include/ipc_evs.h ../include/saAis.h
 util.o: ../include/evs.h ../include/saClm.h ../include/ipc_gen.h util.h
-amf.o: ../include/ais_types.h ../include/ais_amf.h ../include/ais_types.h
+amf.o: ../include/saAis.h ../include/ais_amf.h ../include/saAis.h
 amf.o: ../include/ipc_evs.h ../include/evs.h ../include/saClm.h
 amf.o: ../include/ipc_gen.h util.h
-clm.o: ../include/ais_types.h ../include/saClm.h ../include/ais_types.h
+clm.o: ../include/saAis.h ../include/saClm.h ../include/saAis.h
 clm.o: ../include/ipc_evs.h ../include/evs.h ../include/saClm.h
 clm.o: ../include/ipc_gen.h ../include/ipc_clm.h util.h
-ckpt.o: ../include/list.h ../include/ais_types.h ../include/saCkpt.h
-ckpt.o: ../include/ais_types.h ../include/ipc_evs.h ../include/evs.h
+ckpt.o: ../include/list.h ../include/saAis.h ../include/saCkpt.h
+ckpt.o: ../include/saAis.h ../include/ipc_evs.h ../include/evs.h
 ckpt.o: ../include/saClm.h ../include/ipc_gen.h util.h
-evt.o: ../include/ipc_evt.h ../include/ais_types.h ../include/saEvt.h
+evt.o: ../include/ipc_evt.h ../include/saAis.h ../include/saEvt.h
 evt.o: ../include/saClm.h ../include/ipc_gen.h util.h ../include/ipc_evs.h
 evt.o: ../include/evs.h ../exec/totempg.h ../exec/aispoll.h
 evt.o: ../exec/totemsrp.h

lib/amf.c

@@ -45,7 +45,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/ais_amf.h"
 #include "../include/ipc_gen.h"
 #include "../include/ipc_amf.h"

lib/ckpt.c

@@ -45,7 +45,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "../include/saCkpt.h"
 #include "../include/ipc_gen.h"

lib/clm.c

@@ -44,7 +44,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saClm.h"
 #include "../include/ipc_gen.h"
 #include "../include/ipc_clm.h"

lib/evs.c

@@ -45,7 +45,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/evs.h"
 #include "../include/ipc_evs.h"
 #include "util.h"

lib/util.c

@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <assert.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/ipc_gen.h"
 #include "util.h"
 
@@ -610,7 +610,7 @@ saVersionVerify (
 			/*
 			 * Check if we can support the major version requested.
 			 */
-			if (versionDatabase->versionsSupported[i].major >= version->major) {
+			if (versionDatabase->versionsSupported[i].majorVersion >= version->majorVersion) {
 				error = SA_AIS_OK;
 				break;
 			} 

test/Makefile

@@ -147,24 +147,24 @@ depend:
 	makedepend -Y -- $(CFLAGS) $(TEST_SRC) > /dev/null 2>&1
 # DO NOT DELETE
 
-testclm.o: ../include/ais_types.h ../include/saClm.h
-testamf.o: ../include/ais_types.h ../include/ais_amf.h ../include/saClm.h
-testamf1.o: ../include/ais_types.h ../include/ais_amf.h
-testamf2.o: ../include/ais_types.h ../include/ais_amf.h
-testamf3.o: ../include/ais_types.h ../include/ais_amf.h
-testamf4.o: ../include/ais_types.h ../include/ais_amf.h
-testamf5.o: ../include/ais_types.h ../include/ais_amf.h
-testamf6.o: ../include/ais_types.h ../include/ais_amf.h
-testamfth.o: ../include/ais_types.h ../include/ais_amf.h ../include/saClm.h
-testckpt.o: ../include/ais_types.h ../include/saCkpt.h sa_error.h
-ckptstress.o: ../include/ais_types.h ../include/saCkpt.h
-ckptbench.o: ../include/ais_types.h ../include/saCkpt.h
-ckptbenchth.o: ../include/ais_types.h ../include/saCkpt.h
-testevt.o: ../include/ais_types.h ../include/saEvt.h
+testclm.o: ../include/saAis.h ../include/saClm.h
+testamf.o: ../include/saAis.h ../include/ais_amf.h ../include/saClm.h
+testamf1.o: ../include/saAis.h ../include/ais_amf.h
+testamf2.o: ../include/saAis.h ../include/ais_amf.h
+testamf3.o: ../include/saAis.h ../include/ais_amf.h
+testamf4.o: ../include/saAis.h ../include/ais_amf.h
+testamf5.o: ../include/saAis.h ../include/ais_amf.h
+testamf6.o: ../include/saAis.h ../include/ais_amf.h
+testamfth.o: ../include/saAis.h ../include/ais_amf.h ../include/saClm.h
+testckpt.o: ../include/saAis.h ../include/saCkpt.h sa_error.h
+ckptstress.o: ../include/saAis.h ../include/saCkpt.h
+ckptbench.o: ../include/saAis.h ../include/saCkpt.h
+ckptbenchth.o: ../include/saAis.h ../include/saCkpt.h
+testevt.o: ../include/saAis.h ../include/saEvt.h
 testevs.o: ../include/evs.h
-evsbench.o: ../include/ais_types.h ../include/evs.h
-subscription.o: ../include/ais_types.h ../include/saEvt.h
-publish.o: ../include/ais_types.h ../include/saEvt.h
-evtbench.o: ../include/ais_types.h ../include/saEvt.h
-sa_error.o: ../include/ais_types.h
-unlink.o: ../include/ais_types.h ../include/saEvt.h
+evsbench.o: ../include/saAis.h ../include/evs.h
+subscription.o: ../include/saAis.h ../include/saEvt.h
+publish.o: ../include/saAis.h ../include/saEvt.h
+evtbench.o: ../include/saAis.h ../include/saEvt.h
+sa_error.o: ../include/saAis.h
+unlink.o: ../include/saAis.h ../include/saEvt.h

test/ckpt-rd.c

@@ -43,7 +43,7 @@
 #include <sys/un.h>
 #include <time.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 #include "sa_error.h"
 

test/ckpt-wr.c

@@ -42,7 +42,7 @@
 #include <sys/un.h>
 #include <time.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 #include "sa_error.h"
 

test/ckptbench.c

@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 
 int alarm_notice;

test/ckptbenchth.c

@@ -46,7 +46,7 @@
 #include <pthread.h>
 #include <assert.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 
 void printSaNameT (SaNameT *name)

test/ckptstress.c

@@ -42,7 +42,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 
 int ckptinv;

test/evsbench.c

@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "evs.h"
 
 volatile static int alarm_notice = 0;

test/evtbench.c

@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <sys/time.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 
 // #define EVENT_SUBSCRIBE

test/publish.c

@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <sys/time.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 
 // #define EVENT_SUBSCRIBE

test/sa_error.c

@@ -2,7 +2,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "ais_types.h"
+#include "saAis.h"
 
 const char *sa_error_list[] = {
 	"OUT_OF_RANGE",

test/subscription.c

@@ -11,7 +11,7 @@
 #include <sys/poll.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 
 #define  TEST_EVENT_ORDER 1

test/test.cpp

@@ -14,7 +14,7 @@
 #include <iostream>
 
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 
 

test/testamf.c

@@ -41,7 +41,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 #include "saClm.h"
 

test/testamf1.c

@@ -42,7 +42,7 @@
 #include <sys/un.h>
 #include <sched.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)

test/testamf2.c

@@ -42,7 +42,7 @@
 #include <sys/un.h>
 #include <sched.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)

test/testamf3.c

@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)

test/testamf4.c

@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)

test/testamf5.c

@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)

test/testamf6.c

@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)

test/testamfth.c

@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 #include "saClm.h"
 

test/testckpt.c

@@ -43,7 +43,7 @@
 #include <sys/un.h>
 #include <sys/time.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 #include "sa_error.h"
 

test/testclm.c

@@ -42,7 +42,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saClm.h"
 
 void printSaClmNodeAddressT (SaClmNodeAddressT *nodeAddress) {

test/testevt.c

@@ -62,7 +62,7 @@
 #include <unistd.h>
 #include <sys/poll.h>
 #include <malloc.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 
 extern int get_sa_error(SaAisErrorT, char *, int);

test/testparse.c

@@ -33,7 +33,7 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../exec/parse.h"
 #include "../exec/print.h"
 

test/unlink.c

@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <sys/time.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 
 #define TRY_WAIT 2