JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'mksh/master'

Browse Source 
Conflicts:
	check.t
	main.c
This commit is contained in:
KO Myung-Hun
2015-08-15 23:23:55 +09:00
parent 12271f0adc 92978953b2
commit df20ee1fff
8 changed files with 72 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sh.h
View File

@@ -172,9 +172,9 @@
#endif
#ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.739 2015/07/10 19:36:37 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.741 2015/08/13 22:06:23 tg Exp $");
#endif
#define MKSH_VERSION "R51 2015/07/10"
#define MKSH_VERSION "R51 2015/08/13"
/* arithmetic types: C implementation */
#if !HAVE_CAN_INTTYPES
@@ -337,15 +337,15 @@ struct rusage {
/* determine ksh_NSIG: first, use the traditional definitions */
#undef ksh_NSIG
#if defined(NSIG)
#define ksh_NSIG NSIG
#define ksh_NSIG (NSIG)
#elif defined(_NSIG)
#define ksh_NSIG _NSIG
#define ksh_NSIG (_NSIG)
#elif defined(SIGMAX)
#define ksh_NSIG (SIGMAX + 1)
#elif defined(_SIGMAX)
#define ksh_NSIG (_SIGMAX + 1)
#elif defined(NSIG_MAX)
#define ksh_NSIG NSIG_MAX
#define ksh_NSIG (NSIG_MAX)
#else
# error Please have your platform define NSIG.
#endif
@@ -367,7 +367,7 @@ struct rusage {
#else
/* since it’s usable, prefer it */
#undef ksh_NSIG
#define ksh_NSIG NSIG_MAX
#define ksh_NSIG (NSIG_MAX)
#endif
/* if NSIG_MAX is now still defined, use sysconf(_SC_NSIG) at runtime */
#endif
@@ -387,10 +387,12 @@ struct rusage {
#endif
#ifdef __OS2__
#define MKSH_PATHSEPE "\\;"
#define MKSH_PATHSEPS ";"
#define MKSH_PATHSEPC ';'
#define MKSH_UNIXROOT "/@unixroot"
#else
#define MKSH_PATHSEPE ":"
#define MKSH_PATHSEPS ":"
#define MKSH_PATHSEPC ':'
#define MKSH_UNIXROOT ""