Resolve name conflict with Sun's <sys/kbd.h> by renaming STRING enum value to XF86_TOKEN_STRING. This way, don't need the special #undef hack anymore. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>