From b54b3fb0235659bb387d9c3d852e1942e1870208 Mon Sep 17 00:00:00 2001 From: Richard Stallman Date: Thu, 6 May 1993 17:39:52 +0000 Subject: [PATCH] (OBJC_GEN_METHOD_LABEL): Do use CAT_NAME. From-SVN: r4364 --- gcc/objc/objc-act.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 6524610073e..25eaa64b55a 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -52,15 +52,16 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ Perhaps there's a danger that it will make name conflicts if method names contain underscores. -- rms. */ #ifndef OBJC_GEN_METHOD_LABEL -#define OBJC_GEN_METHOD_LABEL(BUF, IS_INST, CLASS_NAME, CAT_NAME, SEL_NAME, NUM) \ - do { \ - char *temp; \ - sprintf ((BUF), "_%s_%s_%s", \ - ((IS_INST) ? "i" : "c"), \ - (CLASS_NAME), \ - (SEL_NAME)); \ - for (temp = (BUF); *temp; temp++) \ - if (*temp == ':') *temp = '_'; \ +#define OBJC_GEN_METHOD_LABEL(BUF, IS_INST, CLASS_NAME, CAT_NAME, SEL_NAME, NUM) \ + do { \ + char *temp; \ + sprintf ((BUF), "_%s_%s_%s_%s", \ + ((IS_INST) ? "i" : "c"), \ + (CLASS_NAME), \ + ((CAT_NAME)? (CAT_NAME) : ""), \ + (SEL_NAME)); \ + for (temp = (BUF); *temp; temp++) \ + if (*temp == ':') *temp = '_'; \ } while (0) #endif -- 2.30.2