Merge: * xmenu.c: conform to C89 const rules