From: Adrian Bunk <bunk@fs.tum.de>
To: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Cc: linux-kernel@vger.kernel.org, irda-users@lists.sourceforge.net,
Dag Brattli <dagb@cs.uit.no>
Subject: [2.4 patch][3/6] ircomm_param.c: fix __FUNCTION__ paste error
Date: Thu, 26 Aug 2004 21:59:43 +0200 [thread overview]
Message-ID: <20040826195943.GE12772@fs.tum.de> (raw)
In-Reply-To: <20040826195133.GB12772@fs.tum.de>
I got the following compile error when trying to build 2.4.28-pre2 using
gcc 3.4:
<-- snip -->
...
gcc-3.4 -D__KERNEL__
-I/home/bunk/linux/kernel-2.4/linux-2.4.28-pre2-full/include -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
-fomit-frame-pointer -pipe -mpreferred-stack-boundary=2 -march=athlon
-fno-unit-at-a-time -nostdinc -iwithprefix include
-DKBUILD_BASENAME=ircomm_param -c -o ircomm_param.o ircomm_param.c
ircomm_param.c: In function `ircomm_param_service_type':
ircomm_param.c:201: error: parse error before "__FUNCTION__"
make[4]: *** [ircomm_param.o] Error 1
make[4]: Leaving directory `/home/bunk/linux/kernel-2.4/linux-2.4.28-pre2-full/net/irda/ircomm'
<-- snip -->
The patch below fixes this issue by removing the superfluous
__FUNCTION__ (similar to how it is in 2.6).
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
--- linux-2.4.28-pre2-full/net/irda/ircomm/ircomm_param.c.old 2004-08-26 19:28:00.000000000 +0200
+++ linux-2.4.28-pre2-full/net/irda/ircomm/ircomm_param.c 2004-08-26 19:29:46.000000000 +0200
@@ -198,7 +198,7 @@
IRDA_DEBUG(2, "%s(), No common service type to use!\n", __FUNCTION__);
return -1;
}
- IRDA_DEBUG(0, __FUNCTION__ "%s(), services in common=%02x\n", __FUNCTION__,
+ IRDA_DEBUG(0, "%s(), services in common=%02x\n", __FUNCTION__ ,
service_type);
/*
next prev parent reply other threads:[~2004-08-26 20:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-08-26 19:51 [2.4 patch][0/6] fix compile errors with gcc 3.4 Adrian Bunk
2004-08-26 19:54 ` [2.4 patch][1/6] ibmphp_res.c: fix gcc 3.4 compilation Adrian Bunk
2004-08-27 12:03 ` Marcelo Tosatti
2004-08-27 14:54 ` Adrian Bunk
2004-08-26 19:56 ` [2.4 patch][1/6] lmc_media.c: " Adrian Bunk
2004-08-28 22:58 ` Jeff Garzik
2004-08-28 23:13 ` Adrian Bunk
2004-08-26 19:59 ` Adrian Bunk [this message]
2004-08-26 20:02 ` [2.4 patch][4/6] irlmp.c: " Adrian Bunk
2004-08-26 20:04 ` [2.4 patch][5/6] asm-i386/smpboot.h: " Adrian Bunk
2004-08-26 20:07 ` [2.4 patch][6/6] dscc4.c: " Adrian Bunk
2004-08-27 18:52 ` Francois Romieu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040826195943.GE12772@fs.tum.de \
--to=bunk@fs.tum.de \
--cc=dagb@cs.uit.no \
--cc=irda-users@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo.tosatti@cyclades.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox