[Pkg-wmaker-commits] [wmbiff] 27/32: fixed misunderstanding of the use of ## in macros with strings - the compiler does the concatenation, not the preprocessor

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_3_8
in repository wmbiff.

commit 56e359f08a4368524f0e3499c90aed4e738b8fe7
Author: bluehal <bluehal>
Date:   Tue Mar 12 23:53:15 2002 +0000

    fixed misunderstanding of the use of ## in macros with strings - the compiler does the concatenation, not the preprocessor
---
 wmbiff/Client.h      | 4 ++--
 wmbiff/Imap4Client.c | 2 +-
 wmbiff/Pop3Client.c  | 4 ++--
 wmbiff/ShellClient.c | 2 +-
 wmbiff/tlsComm.c     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wmbiff/Client.h b/wmbiff/Client.h
index 15736a0..231f7e2 100644
--- a/wmbiff/Client.h
+++ b/wmbiff/Client.h
@@ -1,4 +1,4 @@
-/* $Id: Client.h,v 1.11 2002/03/06 07:15:08 bluehal Exp $ */
+/* $Id: Client.h,v 1.12 2002/03/12 23:53:15 bluehal Exp $ */
 /* Author : Scott Holden ( scotth at thezone.net )
    Modified : Yong-iL Joh ( tolkien at mizi.com )
    Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
@@ -110,7 +110,7 @@ extern int debug_default;
 #define DMA(msglevel, X...) \
 do { \
   if (debug_default >= msglevel) { \
-     printf("wmbiff: " ##X); \
+     printf("wmbiff: " X); \
 (void)fflush(NULL); \
   } \
 } while(0)
diff --git a/wmbiff/Imap4Client.c b/wmbiff/Imap4Client.c
index 825c29f..4052d00 100644
--- a/wmbiff/Imap4Client.c
+++ b/wmbiff/Imap4Client.c
@@ -30,7 +30,7 @@
 void asprintf( /*@out@ */ char **out, char *fmt, ...);
 #endif
 
-#define IMAP_DM(pc, lvl, args...) DM(pc, lvl, "imap4: " ##args)
+#define IMAP_DM(pc, lvl, args...) DM(pc, lvl, "imap4: " args)
 
 /* this array maps server:port pairs to file descriptors, so
    that when more than one mailbox is queried from a server,
diff --git a/wmbiff/Pop3Client.c b/wmbiff/Pop3Client.c
index 81b38bd..0508c82 100644
--- a/wmbiff/Pop3Client.c
+++ b/wmbiff/Pop3Client.c
@@ -1,4 +1,4 @@
-/* $Id: Pop3Client.c,v 1.8 2002/03/02 06:41:55 bluehal Exp $ */
+/* $Id: Pop3Client.c,v 1.9 2002/03/12 23:53:15 bluehal Exp $ */
 /* Author : Scott Holden ( scotth at thezone.net )
    Modified : Yong-iL Joh ( tolkien at mizi.com )
    Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
@@ -19,7 +19,7 @@
 #endif
 
 #define	PCU	(pc->u).pop
-#define POP_DM(pc, lvl, args...) DM(pc, lvl, "pop3: " ##args)
+#define POP_DM(pc, lvl, args...) DM(pc, lvl, "pop3: " args)
 
 #ifdef WITH_GCRYPT
 static FILE *authenticate_md5(Pop3 pc, FILE * fp, char *unused);
diff --git a/wmbiff/ShellClient.c b/wmbiff/ShellClient.c
index b3698d5..e1cf744 100644
--- a/wmbiff/ShellClient.c
+++ b/wmbiff/ShellClient.c
@@ -16,7 +16,7 @@
 #include <dmalloc.h>
 #endif
 
-#define SH_DM(pc, lvl, args...) DM(pc, lvl, "shell: " ##args)
+#define SH_DM(pc, lvl, args...) DM(pc, lvl, "shell: " args)
 
 /* kind_pclose checks the return value from pclose and prints
    some nice error messages about it.  ordinarily, this would be 
diff --git a/wmbiff/tlsComm.c b/wmbiff/tlsComm.c
index af76fee..a49e5ac 100644
--- a/wmbiff/tlsComm.c
+++ b/wmbiff/tlsComm.c
@@ -29,7 +29,7 @@
 
 /* WARNING: implcitly uses scs to gain access to the mailbox
    that holds the per-mailbox debug flag. */
-#define TDM(lvl, args...) DM(scs->pc, lvl, "comm: " ##args)
+#define TDM(lvl, args...) DM(scs->pc, lvl, "comm: " args)
 
 /* this is the per-connection state that is maintained for
    each connection; BIG variables are for ssl (null if not

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git