diff options
Diffstat (limited to 'gcc/cpphash.h')
| -rw-r--r-- | gcc/cpphash.h | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/gcc/cpphash.h b/gcc/cpphash.h index 9aff511678c..16aba087b88 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -1,5 +1,5 @@ /* Part of CPP library. - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -130,26 +130,6 @@ extern unsigned char *_cpp_unaligned_alloc PARAMS ((cpp_reader *, size_t)); #define BUFF_FRONT(BUFF) ((BUFF)->cur) #define BUFF_LIMIT(BUFF) ((BUFF)->limit) -/* List of directories to look for include files in. */ -struct search_path -{ - struct search_path *next; - - /* NOTE: NAME may not be null terminated for the case of the current - file's directory! */ - const char *name; - unsigned int len; - /* We use these to tell if the directory mentioned here is a duplicate - of an earlier directory on the search path. */ - ino_t ino; - dev_t dev; - /* Nonzero if it is a system include directory. */ - int sysp; - /* Mapping of file names for this directory. Only used on MS-DOS - and related platforms. */ - struct file_name_map *name_map; -}; - /* #include types. */ enum include_type {IT_INCLUDE, IT_INCLUDE_NEXT, IT_IMPORT, IT_CMDLINE}; @@ -324,7 +304,7 @@ struct cpp_buffer /* The directory of the this buffer's file. Its NAME member is not allocated, so we don't need to worry about freeing it. */ - struct search_path dir; + struct cpp_path dir; /* Used for buffer overlays by cpptrad.c. */ const uchar *saved_cur, *saved_rlimit; @@ -369,6 +349,10 @@ struct cpp_reader _cpp_maybe_push_include_file has yet to restore the line map. */ struct pending_option **next_include_file; + /* Search paths for include files. */ + struct cpp_path *quote_include; /* "" */ + struct cpp_path *bracket_include; /* <> */ + /* Multiple include optimisation. */ const cpp_hashnode *mi_cmacro; const cpp_hashnode *mi_ind_cmacro; @@ -441,6 +425,10 @@ struct cpp_reader /* Used when doing preprocessed output. */ struct printer print; + /* Nonzero means don't look for #include "foo" the source-file + directory. */ + unsigned char quote_ignores_source_dir; + /* Whether cpplib owns the hashtable. */ unsigned char our_hashtable; @@ -521,7 +509,6 @@ extern void _cpp_destroy_hashtable PARAMS ((cpp_reader *)); /* In cppfiles.c */ extern void _cpp_fake_include PARAMS ((cpp_reader *, const char *)); extern void _cpp_never_reread PARAMS ((struct include_file *)); -extern char *_cpp_simplify_pathname PARAMS ((char *)); extern bool _cpp_read_file PARAMS ((cpp_reader *, const char *)); extern bool _cpp_execute_include PARAMS ((cpp_reader *, const cpp_token *, |
