avoid name clash with macro None in glx.h, refs #8204

svn path=/trunk/boost/xpressive/; revision=83303