re PR fortran/30276 (gfortran include problem)
2007-01-02 Tobias Burnus <burnus@net-b.de> Jakub Jelinek <jakub@redhat.com> PR fortran/30276 * scanner.c (open_included_file): Revert patch. (gfc_open_included_file): Support absolute pathnames. (gfc_open_intrinsic_module): Support absolute pathnames. Co-Authored-By: Jakub Jelinek <jakub@redhat.com> From-SVN: r120431
This commit is contained in:
parent
b8a00a4dcb
commit
e01f74e08e
2 changed files with 14 additions and 5 deletions
|
@ -1,3 +1,11 @@
|
|||
2007-01-02 Tobias Burnus <burnus@net-b.de>
|
||||
Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR fortran/30276
|
||||
* scanner.c (open_included_file): Revert patch.
|
||||
(gfc_open_included_file): Support absolute pathnames.
|
||||
(gfc_open_intrinsic_module): Support absolute pathnames.
|
||||
|
||||
2007-01-03 Brooks Moses <brooks.moses@codesourcery.com>
|
||||
|
||||
* gfortran.texi (GNU Fortran and GCC): Rewrite
|
||||
|
|
|
@ -199,11 +199,6 @@ open_included_file (const char *name, gfc_directorylist *list, bool module)
|
|||
gfc_directorylist *p;
|
||||
FILE *f;
|
||||
|
||||
f = gfc_open_file (name);
|
||||
|
||||
if (f != NULL)
|
||||
return f;
|
||||
|
||||
for (p = list; p; p = p->next)
|
||||
{
|
||||
if (module && !p->use_for_modules)
|
||||
|
@ -231,6 +226,9 @@ gfc_open_included_file (const char *name, bool include_cwd, bool module)
|
|||
{
|
||||
FILE *f;
|
||||
|
||||
if (IS_ABSOLUTE_PATH (name))
|
||||
return gfc_open_file (name);
|
||||
|
||||
if (include_cwd)
|
||||
{
|
||||
f = gfc_open_file (name);
|
||||
|
@ -244,6 +242,9 @@ gfc_open_included_file (const char *name, bool include_cwd, bool module)
|
|||
FILE *
|
||||
gfc_open_intrinsic_module (const char *name)
|
||||
{
|
||||
if (IS_ABSOLUTE_PATH (name))
|
||||
return gfc_open_file (name);
|
||||
|
||||
return open_included_file (name, intrinsic_modules_dirs, true);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue