소스 검색

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
Steven Dake 19 년 전
부모
커밋
71ca38d92f
2개의 변경된 파일9개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 1
      exec/ipc.c
  2. 8 8
      include/ipc_gen.h

+ 1 - 1
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,

+ 8 - 8
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 {