These files, among others, already use #elif: bfd/bfdio.c since gdb 6.1 gdb/top.c since gdb 5.2.1 gdb/utils.c since gdb 4.17 So #elif is standard, and we're already using it! Safe as houses.