[PATCH] Move cpp_macro to cpplib.h