aboutsummaryrefslogtreecommitdiff
path: root/gcc/objc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/objc')
-rw-r--r--gcc/objc/Make-lang.in2
-rw-r--r--gcc/objc/objc-act.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index 86b3dab..efb11b0 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -90,7 +90,7 @@ $(srcdir)/objc/objc-parse.y: $(srcdir)/c-parse.in
objc-act.o : $(srcdir)/objc/objc-act.c \
$(CONFIG_H) $(TREE_H) $(RTL_H) $(SYSTEM_H) $(EXPR_H) $(TARGET_H) \
- $(C_COMMON_H) $(srcdir)/c-tree.h \
+ $(C_COMMON_H) $(srcdir)/c-tree.h $(srcdir)/diagnostic.h \
$(srcdir)/toplev.h $(srcdir)/flags.h $(srcdir)/objc/objc-act.h \
$(srcdir)/input.h $(srcdir)/function.h $(srcdir)/output.h $(srcdir)/debug.h \
$(srcdir)/langhooks.h $(LANGHOOKS_DEF_H) gtype-objc.h
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 2835f83..cc4f67b 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -56,6 +56,7 @@ Boston, MA 02111-1307, USA. */
#include "ggc.h"
#include "debug.h"
#include "target.h"
+#include "diagnostic.h"
/* This is the default way of generating a method name. */
/* I am not sure it is really correct.
@@ -3415,9 +3416,9 @@ error_with_ivar (message, decl, rawdecl)
tree decl;
tree rawdecl;
{
- count_error (0);
+ diagnostic_count_error (global_dc, DK_ERROR);
- report_error_function (DECL_SOURCE_FILE (decl));
+ diagnostic_report_current_function (global_dc);
error_with_file_and_line (DECL_SOURCE_FILE (decl),
DECL_SOURCE_LINE (decl),
@@ -6894,10 +6895,10 @@ warn_with_method (message, mtype, method)
int mtype;
tree method;
{
- if (count_error (1) == 0)
+ if (!diagnostic_count_error (global_dc, DK_WARNING))
return;
- report_error_function (DECL_SOURCE_FILE (method));
+ diagnostic_report_current_function (global_dc);
/* Add a readable method name to the warning. */
warning_with_file_and_line (DECL_SOURCE_FILE (method),