• R/O
  • HTTP
  • SSH
  • HTTPS

mingw-get: Commit

The MinGW.org Installation Manager Tool


Commit MetaInfo

Revisión42d3a9b4d243cbf07ee482db741fc704e364cb06 (tree)
Tiempo2020-06-19 22:39:05
AutorKeith Marshall <keith@user...>
CommiterKeith Marshall

Log Message

Accommodate C++11 string constant conflation limitations.

Cambiar Resumen

Diferencia incremental

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
11 2020-06-19 Keith Marshall <keith@users.osdn.me>
22
3+ Accommodate C++11 string constant conflation limitations.
4+
5+ * src/dllhook.cpp (MSG_INTERNAL_ERROR)
6+ * src/pkgexec.cpp (LUA_LIBEXEC_PATH): Insert white space, to separate
7+ adjacent string constants in conflated text.
8+
9+2020-06-19 Keith Marshall <keith@users.osdn.me>
10+
311 Force "C" linkage for setup key definitions.
412
513 * src/setup.cpp (uri_key, mirror_key, value_none): Wrap them...
--- a/src/dllhook.cpp
+++ b/src/dllhook.cpp
@@ -3,8 +3,8 @@
33 *
44 * $Id$
55 *
6- * Written by Keith Marshall <keithmarshall@users.sourceforge.net>
7- * Copyright (C) 2013, MinGW.org Project
6+ * Written by Keith Marshall <keith@users.osdn.me>
7+ * Copyright (C) 2013, 2020, MinGW.org Project
88 *
99 *
1010 * Implementation of the processing redirector hook, to be provided
@@ -56,7 +56,7 @@ static const char *setup_key = "setup";
5656 bool AppWindowMaker::SetupToolInvoked = true;
5757
5858 static const char *internal_error = "internal error";
59-#define MSG_INTERNAL_ERROR(MSG) "%s: "MSG_##MSG"\n", internal_error
59+#define MSG_INTERNAL_ERROR(MSG) "%s: " MSG_ ## MSG "\n", internal_error
6060
6161 #define MSG_INVALID_REQUEST "invalid request code specified"
6262 #define MSG_NOTIFY_MAINTAINER "please report this to the mingw-get maintainer"
--- a/src/pkgexec.cpp
+++ b/src/pkgexec.cpp
@@ -3,8 +3,8 @@
33 *
44 * $Id$
55 *
6- * Written by Keith Marshall <keithmarshall@users.sourceforge.net>
7- * Copyright (C) 2009-2013, MinGW.org Project
6+ * Written by Keith Marshall <keith@users.osdn.me>
7+ * Copyright (C) 2009-2013, 2020, MinGW.org Project
88 *
99 *
1010 * Implementation of package management task scheduler and executive.
@@ -761,7 +761,7 @@ LUA_INLINE bool init_lua_path()
761761 * interpreter will load scripts from the libexec directory associated with
762762 * the running mingw-get.exe instance.
763763 */
764- putenv( "LUA_PATH=!\\?.lua;!"LUA_LIBEXEC_PATH";!\\.."LUA_LIBEXEC_PATH );
764+ putenv( "LUA_PATH=!\\?.lua;!" LUA_LIBEXEC_PATH ";!\\.." LUA_LIBEXEC_PATH );
765765 return true;
766766 }
767767
Show on old repository browser