fix-header.c (read_scan_file): Use cpp_get_callbacks and cpp_get_options rather than dereferencing pfile and...

        * fix-header.c (read_scan_file): Use cpp_get_callbacks and
        cpp_get_options rather than dereferencing pfile and using
        CPP_OPTION.
        * scan-decls.c (scan_decls): Use return value of
        cpp_pop_buffer rather than CPP_BUFFER.

From-SVN: r38972