Accommodate C++11 string constant conflation limitations.

diff --git a/ChangeLog b/ChangeLog
index b27b578..bf45644 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2020-06-19  Keith Marshall  <keith@users.osdn.me>
 
+       Accommodate C++11 string constant conflation limitations.
+
+       * src/dllhook.cpp (MSG_INTERNAL_ERROR)
+       * src/pkgexec.cpp (LUA_LIBEXEC_PATH): Insert white space, to separate
+       adjacent string constants in conflated text.
+
+2020-06-19  Keith Marshall  <keith@users.osdn.me>
+
        Force "C" linkage for setup key definitions.
 
        * src/setup.cpp (uri_key, mirror_key, value_none): Wrap them...

diff --git a/src/dllhook.cpp b/src/dllhook.cpp
index 3d117e3..eed0a62 100644 (file)
--- a/src/dllhook.cpp
+++ b/src/dllhook.cpp
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Written by Keith Marshall <keithmarshall@users.sourceforge.net>
- * Copyright (C) 2013, MinGW.org Project
+ * Written by Keith Marshall <keith@users.osdn.me>
+ * Copyright (C) 2013, 2020, MinGW.org Project
  *
  *
  * Implementation of the processing redirector hook, to be provided
@@ -56,7 +56,7 @@ static const char *setup_key = "setup";
 bool AppWindowMaker::SetupToolInvoked = true;
 
 static const char *internal_error = "internal error";
-#define MSG_INTERNAL_ERROR(MSG) "%s: "MSG_##MSG"\n", internal_error
+#define MSG_INTERNAL_ERROR(MSG) "%s: " MSG_ ## MSG "\n", internal_error
 
 #define MSG_INVALID_REQUEST    "invalid request code specified"
 #define MSG_NOTIFY_MAINTAINER  "please report this to the mingw-get maintainer"

diff --git a/src/pkgexec.cpp b/src/pkgexec.cpp
index 43cac98..ef86aac 100644 (file)
--- a/src/pkgexec.cpp
+++ b/src/pkgexec.cpp
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Written by Keith Marshall <keithmarshall@users.sourceforge.net>
- * Copyright (C) 2009-2013, MinGW.org Project
+ * Written by Keith Marshall <keith@users.osdn.me>
+ * Copyright (C) 2009-2013, 2020, MinGW.org Project
  *
  *
  * Implementation of package management task scheduler and executive.
@@ -761,7 +761,7 @@ LUA_INLINE bool init_lua_path()
    * interpreter will load scripts from the libexec directory associated with
    * the running mingw-get.exe instance.
    */
-  putenv( "LUA_PATH=!\\?.lua;!"LUA_LIBEXEC_PATH";!\\.."LUA_LIBEXEC_PATH );
+  putenv( "LUA_PATH=!\\?.lua;!" LUA_LIBEXEC_PATH ";!\\.." LUA_LIBEXEC_PATH );
   return true;
 }