Rename several xlat structures to avoid collisions
* bjm.c (which): Rename to qm_which.
* ipc.c (msg_flags): Rename to ipc_msg_flags.
* time.c (which): Rename to itimer_which.
diff --git a/ipc.c b/ipc.c
index 144c52b..f1af856 100644
--- a/ipc.c
+++ b/ipc.c
@@ -129,7 +129,7 @@
XLAT_END
};
-static const struct xlat msg_flags[] = {
+static const struct xlat ipc_msg_flags[] = {
XLAT(MSG_NOERROR),
XLAT(MSG_EXCEPT),
XLAT(IPC_NOWAIT),
@@ -203,7 +203,7 @@
tprints("}");
}
tprintf(", %lu, ", count);
- printflags(msg_flags, flags, "MSG_???");
+ printflags(ipc_msg_flags, flags, "MSG_???");
}
int sys_msgsnd(struct tcb *tcp)
@@ -254,11 +254,11 @@
tprint_msgrcv(tcp, (long) tmp.msgp,
tcp->u_arg[1], tmp.msgtyp);
}
- printflags(msg_flags, tcp->u_arg[2], "MSG_???");
+ printflags(ipc_msg_flags, tcp->u_arg[2], "MSG_???");
} else {
tprint_msgrcv(tcp, tcp->u_arg[1],
tcp->u_arg[2], tcp->u_arg[3]);
- printflags(msg_flags, tcp->u_arg[4], "MSG_???");
+ printflags(ipc_msg_flags, tcp->u_arg[4], "MSG_???");
}
}
return 0;