From 85d7059c48e6f2e56798488e81c47e8c38fe9cf4 Mon Sep 17 00:00:00 2001 From: tg Date: Sat, 16 Feb 2013 00:21:57 +0000 Subject: [PATCH] =?UTF-8?q?=E2=80=A6=20I=20fsck=E2=80=99d=20up=20and=20bui?= =?UTF-8?q?lt=20R42b=20from=20MAIN=20ipv=20mksh-R42stable=E2=80=A6=20oh=20?= =?UTF-8?q?well.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO: convert enum to something like uint8_t to save even more space --- Build.sh | 6 +++--- Makefile | 4 ++-- sh.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Build.sh b/Build.sh index f466059..e79a89c 100644 --- a/Build.sh +++ b/Build.sh @@ -1,5 +1,5 @@ #!/bin/sh -srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.616 2013/02/11 16:27:56 tg Exp $' +srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.617 2013/02/16 00:21:55 tg Exp $' #- # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012, 2013 @@ -1529,7 +1529,7 @@ else #define EXTERN #define MKSH_INCLUDES_ONLY #include "sh.h" - __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.616 2013/02/11 16:27:56 tg Exp $"); + __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.617 2013/02/16 00:21:55 tg Exp $"); int main(void) { printf("Hello, World!\n"); return (0); } EOF case $cm in @@ -2122,7 +2122,7 @@ addsrcs USE_PRINTF_BUILTIN printf.c test 1 = "$USE_PRINTF_BUILTIN" && add_cppflags -DMKSH_PRINTF_BUILTIN test 1 = "$HAVE_CAN_VERB" && CFLAGS="$CFLAGS -verbose" test -n "$LDSTATIC" && add_cppflags -DMKSH_OPTSTATIC -add_cppflags -DMKSH_BUILD_R=419 +add_cppflags -DMKSH_BUILD_R=429 $e $bi$me: Finished configuration testing, now producing output.$ao diff --git a/Makefile b/Makefile index 99f49ed..e02c951 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $MirOS: src/bin/mksh/Makefile,v 1.109 2012/12/17 23:46:31 tg Exp $ +# $MirOS: src/bin/mksh/Makefile,v 1.110 2013/02/16 00:21:56 tg Exp $ #- # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 @@ -55,7 +55,7 @@ CPPFLAGS+= -DMKSH_ASSUME_UTF8 -DMKSH_DISABLE_DEPRECATED \ -DHAVE_STRLCPY=1 -DHAVE_FLOCK_DECL=1 -DHAVE_REVOKE_DECL=1 \ -DHAVE_SYS_ERRLIST_DECL=1 -DHAVE_SYS_SIGLIST_DECL=1 \ -DHAVE_PERSISTENT_HISTORY=1 -DHAVE_SILENT_IDIVWRAPV=0 \ - -DMKSH_BUILD_R=419 + -DMKSH_BUILD_R=429 CPPFLAGS+= -D${${PROG:L}_tf:C/(Mir${MAN:E}{0,1}){2}/4/:S/x/mksh_BUILD/:U} COPTS+= -std=c99 -Wall .endif diff --git a/sh.h b/sh.h index 8137645..2e8c0f9 100644 --- a/sh.h +++ b/sh.h @@ -164,7 +164,7 @@ #endif #ifdef EXTERN -__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.635 2013/02/15 18:50:14 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.636 2013/02/16 00:21:57 tg Exp $"); #endif #define MKSH_VERSION "R42 2013/02/15" @@ -511,7 +511,7 @@ char *ucstrstr(char *, const char *); #define mkssert(e) do { } while (/* CONSTCOND */ 0) #endif -#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 419) +#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 429) #error Must run Build.sh to compile this. int im_sorry_dave(void)