diff options
| author | Tobias Schlüter <tobi@gcc.gnu.org> | 2005-02-24 19:26:27 +0100 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2005-02-24 19:26:27 +0100 |
| commit | cb9e4f55b0bfcbf3b25213774193d4a4bb8a8342 (patch) | |
| tree | 2139266e39d005be3049810c27d9856644ae20f4 /gcc/fortran/interface.c | |
| parent | ef6201a68e43c0c72daadaafaff4a76dad8b0262 (diff) | |
| download | gcc-cb9e4f55b0bfcbf3b25213774193d4a4bb8a8342.zip gcc-cb9e4f55b0bfcbf3b25213774193d4a4bb8a8342.tar.gz gcc-cb9e4f55b0bfcbf3b25213774193d4a4bb8a8342.tar.bz2 | |
Unrevert previously reversed patch, adding this patch:
* module.c (find_true_name): Deal with NULL module.
From-SVN: r95506
Diffstat (limited to 'gcc/fortran/interface.c')
| -rw-r--r-- | gcc/fortran/interface.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 9f163d0..ecbf9a2 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -340,8 +340,9 @@ gfc_compare_types (gfc_typespec * ts1, gfc_typespec * ts2) true names and module names are the same and the module name is nonnull, then they are equal. */ if (strcmp (ts1->derived->name, ts2->derived->name) == 0 - && ts1->derived->module[0] != '\0' - && strcmp (ts1->derived->module, ts2->derived->module) == 0) + && ((ts1->derived->module == NULL && ts2->derived->module == NULL) + || (ts1->derived != NULL && ts2->derived != NULL + && strcmp (ts1->derived->module, ts2->derived->module) == 0))) return 1; /* Compare type via the rules of the standard. Both types must have @@ -1165,7 +1166,7 @@ compare_actual_formal (gfc_actual_arglist ** ap, for (a = actual; a; a = a->next, f = f->next) { - if (a->name[0] != '\0') + if (a->name != NULL) { i = 0; for (f = formal; f; f = f->next, i++) |