From 71ca38d92f74b58c5561f7d947b4974734f8e7e1 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 27 Jun 2006 23:37:06 +0000 Subject: [PATCH] Fix 32/64 endian for all services from a previous missed commit. git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1094 fd59a12c-fef9-0310-b244-a6a79926bd2f --- exec/ipc.c | 2 +- include/ipc_gen.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/exec/ipc.c b/exec/ipc.c index 8e9ee491..5d452721 100644 --- a/exec/ipc.c +++ b/exec/ipc.c @@ -158,7 +158,7 @@ static int response_init_send_response ( res_lib_response_init.header.size = sizeof (mar_res_lib_response_init_t); res_lib_response_init.header.id = MESSAGE_RES_INIT; res_lib_response_init.header.error = error; - res_lib_response_init.conn_info = conn_info; + res_lib_response_init.conn_info = (unsigned long long)conn_info; openais_conn_send_response ( conn_info, diff --git a/include/ipc_gen.h b/include/ipc_gen.h index bc1653a8..fa2d0d4b 100644 --- a/include/ipc_gen.h +++ b/include/ipc_gen.h @@ -69,15 +69,15 @@ static inline void swab_mar_req_header_t (mar_req_header_t *to_swab) } typedef struct { - int size; __attribute((aligned(8))) - int id __attribute((aligned(8))); - SaAisErrorT error __attribute((aligned(8))); + int size; __attribute__((aligned(8))) + int id __attribute__((aligned(8))); + SaAisErrorT error __attribute__((aligned(8))); } mar_res_header_t __attribute__((aligned(8))); typedef struct { - int size __attribute((aligned(8))); - int id __attribute((aligned(8))); - int service __attribute((aligned(8))); + int size __attribute__((aligned(8))); + int id __attribute__((aligned(8))); + int service __attribute__((aligned(8))); } mar_req_lib_resdis_init_t __attribute__((aligned(8))); typedef struct { @@ -86,12 +86,12 @@ typedef struct { typedef struct { mar_req_lib_resdis_init_t resdis_header __attribute__((aligned(8))); - void *conn_info __attribute__((aligned(8))); + mar_uint64_t conn_info __attribute__((aligned(8))); } mar_req_lib_dispatch_init_t __attribute__((aligned(8))); typedef struct { mar_res_header_t header __attribute__((aligned(8))); - void *conn_info __attribute__((aligned(8))); + mar_uint64_t conn_info __attribute__((aligned(8))); } mar_res_lib_response_init_t __attribute__((aligned(8))); typedef struct {