From 27179454a9b60787b5f0b97234348b7c072c4a49 Mon Sep 17 00:00:00 2001 From: tg Date: Thu, 21 Jan 2016 19:38:09 +0000 Subject: [PATCH] hotfix for newer GCC --- sh.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sh.h b/sh.h index 2c3de4e..f5a4ac1 100644 --- a/sh.h +++ b/sh.h @@ -175,7 +175,7 @@ #endif #ifdef EXTERN -__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.758 2016/01/21 18:24:43 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.759 2016/01/21 19:38:09 tg Exp $"); #endif #define MKSH_VERSION "R52 2016/01/21" @@ -867,7 +867,12 @@ EXTERN const char T_function[] E_INIT(" function"); EXTERN const char T_funny_command[] E_INIT("funny $() command"); #define Tcommand (T_funny_command + 10) /* "command" */ EXTERN const char Tfg_badsubst[] E_INIT("fileglob: bad substitution"); +#if defined(__GNUC__) +/* trust this to have string pooling; -Wformat bitches otherwise */ +#define Tbadsubst "bad substitution" +#else #define Tbadsubst (Tfg_badsubst + 10) /* "bad substitution" */ +#endif EXTERN const char Tmissinghere[] E_INIT("missing here document"); #define Theredoc (Tmissinghere + 8) /* "here document" */ EXTERN const char TC_LEX1[] E_INIT("|&;<>() \t\n");