#ifdef MKSH_DISABLE_DEPRECATED do not compile in features scheduled for removal

This commit is contained in:
tg 2011-11-26 17:56:30 +00:00
parent 0695039dc0
commit b3f4c69f05
2 changed files with 12 additions and 11 deletions

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.490 2011/11/25 23:29:30 tg Exp $' srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.491 2011/11/26 17:56:29 tg Exp $'
#- #-
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# Thorsten Glaser <tg@mirbsd.org> # Thorsten Glaser <tg@mirbsd.org>
@ -25,13 +25,14 @@ srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.490 2011/11/25 23:29:30 tg Exp $'
# Environment used: CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF # Environment used: CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF
# TARGET_OS TARGET_OSREV # TARGET_OS TARGET_OSREV
# Feature selectors: USE_PRINTF_BUILTIN # Feature selectors: USE_PRINTF_BUILTIN
# CPPFLAGS recognised: MKSH_ASSUME_UTF8 MKSH_BINSHREDUCED MKSH_CLS_STRING # CPPFLAGS recognised: MKSH_MIDNIGHTBSD01ASH_COMPAT MKSH_CONSERVATIVE_FDS
# MKSH_CONSERVATIVE_FDS MKSH_MIDNIGHTBSD01ASH_COMPAT # MKSH_DONT_EMIT_IDSTRING MKSH_NO_DEPRECATED_WARNING
# MKSH_NOPWNAM MKSH_NO_LIMITS MKSH_SMALL MKSH_S_NOVI # MKSH_DISABLE_DEPRECATED MKSH_ASSUME_UTF8 MKSH_A4PB
# MKSH_UNEMPLOYED MKSH_DEFAULT_EXECSHELL MKSHRC_PATH # MKSH_SMALL MKSH_BINSHREDUCED MKSH_NOPROSPECTOFWORK
# MKSH_DEFAULT_TMPDIR MKSH_CLRTOEOL_STRING MKSH_A4PB # MKSH_UNEMPLOYED MKSH_NO_LIMITS MKSH_DEFAULT_TMPDIR
# MKSH_NO_DEPRECATED_WARNING MKSH_DONT_EMIT_IDSTRING # MKSH_DEFAULT_EXECSHELL MKSHRC_PATH MKSH_CLS_STRING
# MKSH_NOPROSPECTOFWORK MKSH_NO_EXTERNAL_CAT # MKSH_CLRTOEOL_STRING MKSH_NO_EXTERNAL_CAT
# MKSH_NOPWNAM MKSH_S_NOVI
LC_ALL=C LC_ALL=C
export LC_ALL export LC_ALL
@ -1182,7 +1183,7 @@ else
#define EXTERN #define EXTERN
#define MKSH_INCLUDES_ONLY #define MKSH_INCLUDES_ONLY
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.490 2011/11/25 23:29:30 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.491 2011/11/26 17:56:29 tg Exp $");
int main(void) { printf("Hello, World!\n"); return (0); } int main(void) { printf("Hello, World!\n"); return (0); }
EOF EOF
case $cm in case $cm in

4
lex.c
View File

@ -22,7 +22,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.157 2011/10/25 22:36:36 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/lex.c,v 1.158 2011/11/26 17:56:30 tg Exp $");
/* /*
* states while lexing word * states while lexing word
@ -1440,7 +1440,7 @@ getsc_line(Source *s)
alarm(0); alarm(0);
} }
cp = Xstring(s->xs, xp); cp = Xstring(s->xs, xp);
#ifndef MKSH_SMALL #if !defined(MKSH_SMALL) && !defined(MKSH_DISABLE_DEPRECATED)
if (interactive && *cp == '!' && cur_prompt == PS1) { if (interactive && *cp == '!' && cur_prompt == PS1) {
int linelen; int linelen;