All of lore.kernel.org
 help / color / mirror / Atom feed
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
Subject: [2.4 patch][4/6] irlmp.c: fix gcc 3.4 compilation
Date: Thu, 26 Aug 2004 22:02:02 +0200	[thread overview]
Message-ID: <20040826200202.GF12772@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=irlmp  -c -o irlmp.o irlmp.c
irlmp.c: In function `irlmp_flow_indication':
irlmp.c:1244: error: parse error before "__FUNCTION__"
irlmp.c:1258: error: parse error before "__FUNCTION__"
irlmp.c:1277: error: parse error before "__FUNCTION__"
irlmp.c:1284: error: parse error before "__FUNCTION__"
make[3]: *** [irlmp.o] Error 1
make[3]: Leaving directory `/home/bunk/linux/kernel-2.4/linux-2.4.28-pre2-full/net/irda'

<--  snip  -->


The patch below fixes this issue (similar to how it was done in 2.6).


Signed-off-by: Adrian Bunk <bunk@fs.tum.de>

--- linux-2.4.28-pre2-full/net/irda/irlmp.c.old	2004-08-26 19:36:09.000000000 +0200
+++ linux-2.4.28-pre2-full/net/irda/irlmp.c	2004-08-26 19:38:48.000000000 +0200
@@ -1241,7 +1241,7 @@
 	/* Get the number of lsap. That's the only safe way to know
 	 * that we have looped around... - Jean II */
 	lsap_todo = HASHBIN_GET_SIZE(self->lsaps);
-	IRDA_DEBUG(4, __FUNCTION__ "() : %d lsaps to scan\n", lsap_todo);
+	IRDA_DEBUG(4, "%s() : %d lsaps to scan\n", __FUNCTION__ , lsap_todo);
 
 	/* Poll lsap in order until the queue is full or until we
 	 * tried them all.
@@ -1255,7 +1255,7 @@
 			/* Note that if there is only one LSAP on the LAP
 			 * (most common case), self->flow_next is always NULL,
 			 * so we always avoid this loop. - Jean II */
-			IRDA_DEBUG(4, __FUNCTION__ "() : searching my LSAP\n");
+			IRDA_DEBUG(4, "%s() : searching my LSAP\n", __FUNCTION__ );
 
 			/* We look again in hashbins, because the lsap
 			 * might have gone away... - Jean II */
@@ -1274,14 +1274,14 @@
 
 		/* Next time, we will get the next one (or the first one) */
 		self->flow_next = (struct lsap_cb *) hashbin_get_next(self->lsaps);
-		IRDA_DEBUG(4, __FUNCTION__ "() : curr is %p, next was %p and is now %p, still %d to go - queue len = %d\n", curr, next, self->flow_next, lsap_todo, IRLAP_GET_TX_QUEUE_LEN(self->irlap));
+		IRDA_DEBUG(4, "%s() : curr is %p, next was %p and is now %p, still %d to go - queue len = %d\n", __FUNCTION__ , curr, next, self->flow_next, lsap_todo, IRLAP_GET_TX_QUEUE_LEN(self->irlap));
 
 		/* Inform lsap user that it can send one more packet. */
 		if (curr->notify.flow_indication != NULL)
 			curr->notify.flow_indication(curr->notify.instance, 
 						     curr, flow);
 		else
-			IRDA_DEBUG(1, __FUNCTION__ "(), no handler\n");
+			IRDA_DEBUG(1, "%s(), no handler\n", __FUNCTION__ );
 	}
 }
 

  parent reply	other threads:[~2004-08-27  2:24 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 ` [2.4 patch][3/6] ircomm_param.c: fix __FUNCTION__ paste error Adrian Bunk
2004-08-26 20:02 ` Adrian Bunk [this message]
2004-08-26 20:04 ` [2.4 patch][5/6] asm-i386/smpboot.h: fix gcc 3.4 compilation 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=20040826200202.GF12772@fs.tum.de \
    --to=bunk@fs.tum.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.