diff options
author | Fred Fish <fnf@specifix.com> | 1995-11-28 19:33:22 +0000 |
---|---|---|
committer | Fred Fish <fnf@specifix.com> | 1995-11-28 19:33:22 +0000 |
commit | bfe8f5161965bb0b897ec039d52dfb7387a8050b (patch) | |
tree | 5595c1c592ff8a0bfc84b21eae65a27e1ce54c18 /gdb/eval.c | |
parent | c6e4e8349639b10c67bdfe0f3b321168565edbbb (diff) | |
download | gdb-bfe8f5161965bb0b897ec039d52dfb7387a8050b.zip gdb-bfe8f5161965bb0b897ec039d52dfb7387a8050b.tar.gz gdb-bfe8f5161965bb0b897ec039d52dfb7387a8050b.tar.bz2 |
* magic.h: Renamed to gmagic.h to avoid <magic.h> conflict.
* magic.c: Renamed to gmagic.c in sympathy.
* eval.c, gmagic.c, config/tm-magic.h:
Include "gmagic.h" rather than "magic.h".
Diffstat (limited to 'gdb/eval.c')
-rw-r--r-- | gdb/eval.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -30,9 +30,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "language.h" /* For CAST_IS_CONVERSION */ #include "f-lang.h" /* for array bound stuff */ /* start-sanitize-gm */ -#ifdef GENERAL_MAGIC_HACKS -#include "magic.h" -#endif /* GENERAL_MAGIC_HACKS */ +#ifdef GENERAL_MAGIC +#include "gmagic.h" +#endif /* GENERAL_MAGIC */ /* end-sanitize-gm */ /* Prototypes for local functions. */ @@ -845,7 +845,7 @@ evaluate_subexp_standard (expect_type, exp, pos, noside) } /* start-sanitize-gm */ -#ifdef GENERAL_MAGIC_HACKS +#ifdef GENERAL_MAGIC case STRUCTOP_FIELD: tem = longest_to_int (exp->elts[pc + 1].longconst); (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1); @@ -871,7 +871,7 @@ evaluate_subexp_standard (expect_type, exp, pos, noside) NULL, "structure pointer"); } } -#endif /* GENERAL_MAGIC_HACKS */ +#endif /* GENERAL_MAGIC */ /* end-sanitize-gm */ case STRUCTOP_MEMBER: |