From 1b6bea0545fcf50eb5228d591d3dd620d78b169d Mon Sep 17 00:00:00 2001
From: twouters
Date: Tue, 29 May 2001 13:16:22 +0000
Subject: In the definition of LOG_IDENT and SCRIPTDIR, don't try to glue
 string literals together with ##. That's not what ## is for; ## is to glue
 together stringified versions of tokens. The fact that it worked was a bug in
 GCC. Thanx to Jeff Dairiki for reminding me to take care of this.

This fixes SF bug #227694.
---
 src/cgi-wrapper.c | 2 +-
 src/common.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cgi-wrapper.c b/src/cgi-wrapper.c
index 5e0d4be5a..ce7335271 100644
--- a/src/cgi-wrapper.c
+++ b/src/cgi-wrapper.c
@@ -23,7 +23,7 @@
 
 /* passed in by configure */
 #define SCRIPTNAME  SCRIPT
-#define LOG_IDENT   "Mailman cgi-wrapper (" ## SCRIPT ## ")"
+#define LOG_IDENT   "Mailman cgi-wrapper (" SCRIPT ")"
 
 /* GID that CGI scripts run as.  See your Web server's documentation. */
 #define LEGAL_PARENT_GID CGI_GID
diff --git a/src/common.c b/src/common.c
index 5b0f7207f..d70216177 100644
--- a/src/common.c
+++ b/src/common.c
@@ -20,7 +20,7 @@
 #include "common.h"
 
 /* passed in by configure */
-#define SCRIPTDIR PREFIX ## "/scripts/"	     /* trailing slash */
+#define SCRIPTDIR PREFIX "/scripts/"	     /* trailing slash */
 #define MODULEDIR PREFIX		     /* no trailing slash */
 
 const char* scriptdir = SCRIPTDIR;
-- 
cgit v1.3.1