| Revisão | 42d3a9b4d243cbf07ee482db741fc704e364cb06 (tree) |
|---|---|
| Hora | 2020-06-19 22:39:05 |
| Autor |  Keith Marshall <keith@user...> |
| Commiter | Keith Marshall |
Accommodate C++11 string constant conflation limitations.
ChangeLog (diff)
src/dllhook.cpp (diff) src/pkgexec.cpp (diff)| @@ -1,5 +1,13 @@ | ||
| 1 | 1 | 2020-06-19 Keith Marshall <keith@users.osdn.me> |
| 2 | 2 | |
| 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 | + | |
| 3 | 11 | Force "C" linkage for setup key definitions. |
| 4 | 12 | |
| 5 | 13 | * src/setup.cpp (uri_key, mirror_key, value_none): Wrap them... |
| @@ -3,8 +3,8 @@ | ||
| 3 | 3 | * |
| 4 | 4 | * $Id$ |
| 5 | 5 | * |
| 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 | |
| 8 | 8 | * |
| 9 | 9 | * |
| 10 | 10 | * Implementation of the processing redirector hook, to be provided |
| @@ -56,7 +56,7 @@ static const char *setup_key = "setup"; | ||
| 56 | 56 | bool AppWindowMaker::SetupToolInvoked = true; |
| 57 | 57 | |
| 58 | 58 | 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 | |
| 60 | 60 | |
| 61 | 61 | #define MSG_INVALID_REQUEST "invalid request code specified" |
| 62 | 62 | #define MSG_NOTIFY_MAINTAINER "please report this to the mingw-get maintainer" |
| @@ -3,8 +3,8 @@ | ||
| 3 | 3 | * |
| 4 | 4 | * $Id$ |
| 5 | 5 | * |
| 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 | |
| 8 | 8 | * |
| 9 | 9 | * |
| 10 | 10 | * Implementation of package management task scheduler and executive. |
| @@ -761,7 +761,7 @@ LUA_INLINE bool init_lua_path() | ||
| 761 | 761 | * interpreter will load scripts from the libexec directory associated with |
| 762 | 762 | * the running mingw-get.exe instance. |
| 763 | 763 | */ |
| 764 | - putenv( "LUA_PATH=!\\?.lua;!"LUA_LIBEXEC_PATH";!\\.."LUA_LIBEXEC_PATH ); | |
| 764 | + putenv( "LUA_PATH=!\\?.lua;!" LUA_LIBEXEC_PATH ";!\\.." LUA_LIBEXEC_PATH ); | |
| 765 | 765 | return true; |
| 766 | 766 | } |
| 767 | 767 |
Fork