bugfix: make CONSERVATIVE_FDS implied by MKSH_SMALL actually work
This commit is contained in:
parent
67714b270a
commit
35c65bb568
20
sh.h
20
sh.h
|
@ -157,7 +157,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef EXTERN
|
#ifdef EXTERN
|
||||||
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.569 2012/07/01 15:38:07 tg Exp $");
|
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.570 2012/07/01 15:41:56 tg Exp $");
|
||||||
#endif
|
#endif
|
||||||
#define MKSH_VERSION "R40 2012/06/28"
|
#define MKSH_VERSION "R40 2012/06/28"
|
||||||
|
|
||||||
|
@ -412,15 +412,6 @@ extern int wcwidth(__WCHAR_TYPE__);
|
||||||
#define BIT(i) (1 << (i))
|
#define BIT(i) (1 << (i))
|
||||||
#define NELEM(a) (sizeof(a) / sizeof((a)[0]))
|
#define NELEM(a) (sizeof(a) / sizeof((a)[0]))
|
||||||
|
|
||||||
/* these shall be smaller than 100 */
|
|
||||||
#ifdef MKSH_CONSERVATIVE_FDS
|
|
||||||
#define NUFILE 32 /* Number of user-accessible files */
|
|
||||||
#define FDBASE 10 /* First file usable by Shell */
|
|
||||||
#else
|
|
||||||
#define NUFILE 56 /* Number of user-accessible files */
|
|
||||||
#define FDBASE 24 /* First file usable by Shell */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Make MAGIC a char that might be printed to make bugs more obvious, but
|
* Make MAGIC a char that might be printed to make bugs more obvious, but
|
||||||
* not a char that is used often. Also, can't use the high bit as it causes
|
* not a char that is used often. Also, can't use the high bit as it causes
|
||||||
|
@ -569,6 +560,15 @@ im_sorry_dave(void)
|
||||||
#define MKSH_UNEMPLOYED 1
|
#define MKSH_UNEMPLOYED 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* these shall be smaller than 100 */
|
||||||
|
#ifdef MKSH_CONSERVATIVE_FDS
|
||||||
|
#define NUFILE 32 /* Number of user-accessible files */
|
||||||
|
#define FDBASE 10 /* First file usable by Shell */
|
||||||
|
#else
|
||||||
|
#define NUFILE 56 /* Number of user-accessible files */
|
||||||
|
#define FDBASE 24 /* First file usable by Shell */
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* simple grouping allocator
|
* simple grouping allocator
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue