Messages in this thread Patch in this message | | | From | Keith Owens <> | Date | Thu, 31 Aug 2000 19:09:00 +1100 |
| |
Compiling 2.4.0-test7 with the latest IA64 toolchain, gcc version 2.96-ia64-000717 snap 000828. It complained about various include files, "pasting would not give a valid preprocessing token", this version of gcc is a bit more paranoid about the use of '##'.
This patch removes some spurious '##' fields. It also works on IA32 using gcc version egcs-2.91.66 19990314/Linux (egcs-1.1.2 release).
Index: 0-test7.5/include/net/sock.h --- 0-test7.5/include/net/sock.h Thu, 24 Aug 2000 03:13:10 +1000 kaos (linux-2.4/D/40_sock.h 1.6 644) +++ 0-test7.5(w)/include/net/sock.h Thu, 31 Aug 2000 18:36:55 +1100 kaos (linux-2.4/D/40_sock.h 1.6 644) @@ -453,7 +453,7 @@ /* Define this to get the sk->debug debugging facility. */ #define SOCK_DEBUGGING #ifdef SOCK_DEBUGGING -#define SOCK_DEBUG(sk, msg...) do { if((sk) && ((sk)->debug)) printk(KERN_DEBUG ## msg); } while (0) +#define SOCK_DEBUG(sk, msg...) do { if((sk) && ((sk)->debug)) printk(KERN_DEBUG msg); } while (0) #else #define SOCK_DEBUG(sk, msg...) do { } while (0) #endif Index: 0-test7.5/include/linux/sunrpc/debug.h --- 0-test7.5/include/linux/sunrpc/debug.h Thu, 22 Jun 2000 10:06:53 +1000 kaos (linux-2.4/U/31_debug.h 1.1.1.1 644) +++ 0-test7.5(w)/include/linux/sunrpc/debug.h Thu, 31 Aug 2000 18:37:41 +1100 kaos (linux-2.4/U/31_debug.h 1.1.1.1 644) @@ -49,12 +49,12 @@ extern unsigned int nlm_debug; #endif -#define dprintk(args...) dfprintk(FACILITY, ## args) +#define dprintk(args...) dfprintk(FACILITY, args) #undef ifdebug #ifdef RPC_DEBUG # define ifdebug(fac) if (rpc_debug & RPCDBG_##fac) -# define dfprintk(fac, args...) do { ifdebug(fac) printk(## args); } while(0) +# define dfprintk(fac, args...) do { ifdebug(fac) printk(args); } while(0) # define RPC_IFDEBUG(x) x #else # define dfprintk(fac, args...) do ; while (0) @@ -62,7 +62,7 @@ #endif #ifdef RPC_PROFILE -# define pprintk(args...) printk(## args) +# define pprintk(args...) printk(args) #else # define pprintk(args...) do ; while (0) #endif Index: 0-test7.5/include/linux/pci.h --- 0-test7.5/include/linux/pci.h Fri, 26 May 2000 13:10:01 +1000 kaos (linux-2.4/Y/51_pci.h 1.1 644) +++ 0-test7.5(w)/include/linux/pci.h Thu, 31 Aug 2000 18:36:55 +1100 kaos (linux-2.4/Y/51_pci.h 1.1 644) @@ -558,9 +558,9 @@ { return PCIBIOS_DEVICE_NOT_FOUND; } #define _PCI_NOP(o,s,t) \ - extern inline int pcibios_##o##_config_##s## (u8 bus, u8 dfn, u8 where, t val) \ + extern inline int pcibios_##o##_config_##s (u8 bus, u8 dfn, u8 where, t val) \ { return PCIBIOS_FUNC_NOT_SUPPORTED; } \ - extern inline int pci_##o##_config_##s## (struct pci_dev *dev, int where, t val) \ + extern inline int pci_##o##_config_##s (struct pci_dev *dev, int where, t val) \ { return PCIBIOS_FUNC_NOT_SUPPORTED; } #define _PCI_NOP_ALL(o,x) _PCI_NOP(o,byte,u8 x) \ _PCI_NOP(o,word,u16 x) \ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/
| |