[PATCH][2.5] macro madness for Linux 2.5.31

From: Lightweight Patch Manager (patch@luckynet.dynu.com)
Date: Mon Aug 26 2002 - 12:44:30 EST

Next message: Linus Torvalds: "Re: MM patches against 2.5.31"
Previous message: Linus Torvalds: "Re: [patch 2.5.31] transparent PCI-to-PCI bridges"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This patch reduces macro madness with old compilers that didn't know
that one can even write the comma directly after the __FUNCTION__,
like I did in this sentence. Can you parse it? If no, you'll need this
patch either.

diff -Nurp -x SCCS -x CVS -x .deps -x ChangeSet -x BitKeeper linus-2.5/arch/arm/mach-sa1100/system3.c thunder-2.5/arch/arm/mach-sa1100/system3.c
--- linus-2.5/arch/arm/mach-sa1100/system3.c Sat Aug 24 04:50:21 2002
+++ thunder-2.5/arch/arm/mach-sa1100/system3.c Mon Aug 26 11:35:32 2002
@@ -62,7 +62,7 @@
#define DEBUG 1

#ifdef DEBUG
-# define DPRINTK( x, args... ) printk( "%s: line %d: "x, __FUNCTION__, __LINE__, ## args );
+# define DPRINTK( x, args... ) printk( "%s: line %d: " x, __FUNCTION__ , __LINE__ , ## args );
#else
# define DPRINTK( x, args... ) /* nix */
#endif
diff -Nurp -x SCCS -x CVS -x .deps -x ChangeSet -x BitKeeper linus-2.5/drivers/ieee1394/sbp2.c thunder-2.5/drivers/ieee1394/sbp2.c
--- linus-2.5/drivers/ieee1394/sbp2.c Sat Aug 24 04:52:05 2002
+++ thunder-2.5/drivers/ieee1394/sbp2.c Mon Aug 26 11:37:04 2002
@@ -449,7 +449,7 @@ MODULE_DEVICE_TABLE(ieee1394, sbp2_id_ta
/* #define CONFIG_IEEE1394_SBP2_PACKET_DUMP */

#ifdef CONFIG_IEEE1394_SBP2_DEBUG_ORBS
-#define SBP2_ORB_DEBUG(fmt, args...) HPSB_ERR("sbp2(%s): "fmt, __FUNCTION__, ## args)
+#define SBP2_ORB_DEBUG(fmt, args...) HPSB_ERR("sbp2(%s): " fmt, __FUNCTION__ , ## args)
static u32 global_outstanding_command_orbs = 0;
#define outstanding_orb_incr global_outstanding_command_orbs++
#define outstanding_orb_decr global_outstanding_command_orbs--
diff -Nurp -x SCCS -x CVS -x .deps -x ChangeSet -x BitKeeper linus-2.5/drivers/pcmcia/sa1100_system3.c thunder-2.5/drivers/pcmcia/sa1100_system3.c
--- linus-2.5/drivers/pcmcia/sa1100_system3.c Sat Aug 24 04:52:54 2002
+++ thunder-2.5/drivers/pcmcia/sa1100_system3.c Mon Aug 26 11:37:39 2002
@@ -40,7 +40,7 @@
#define DEBUG 0

#ifdef DEBUG
-# define DPRINTK( x, args... ) printk( "%s: line %d: "x, __FUNCTION__, __LINE__, ## args );
+# define DPRINTK( x, args... ) printk( "%s: line %d: " x, __FUNCTION__ , __LINE__ , ## args );
#else
# define DPRINTK( x, args... ) /* nix */
#endif
diff -Nurp -x SCCS -x CVS -x .deps -x ChangeSet -x BitKeeper linus-2.5/drivers/video/aty128fb.c thunder-2.5/drivers/video/aty128fb.c
--- linus-2.5/drivers/video/aty128fb.c Sat Aug 24 04:53:33 2002
+++ thunder-2.5/drivers/video/aty128fb.c Mon Aug 26 11:36:03 2002
@@ -87,7 +87,7 @@
#undef DEBUG

#ifdef DEBUG
-#define DBG(fmt, args...) printk(KERN_DEBUG "aty128fb: %s " fmt, __FUNCTION__, ##args);
+#define DBG(fmt, args...) printk(KERN_DEBUG "aty128fb: %s " fmt, __FUNCTION__ , ##args);
#else
#define DBG(fmt, args...)
#endif

-- Lightweight Patch Manager, without pine. If you have any objections (apart from who I am), tell me

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

Next message: Linus Torvalds: "Re: MM patches against 2.5.31"
Previous message: Linus Torvalds: "Re: [patch 2.5.31] transparent PCI-to-PCI bridges"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Sat Aug 31 2002 - 22:00:17 EST