From 588de030bf792d8fb174d154e7b3a342dc636206 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Wed, 21 Sep 2011 21:15:08 +0300 Subject: Sync with gnu grep, remove many ifdefs. --- mbsupport.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mbsupport.h') diff --git a/mbsupport.h b/mbsupport.h index c3a6b333..4b71019d 100644 --- a/mbsupport.h +++ b/mbsupport.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2004, 2005 the Free Software Foundation, Inc. + * Copyright (C) 2004, 2005, 2011 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. @@ -55,5 +55,12 @@ /* We can handle multibyte strings. */ # define MBS_SUPPORT 1 #else +# define MBS_SUPPORT 0 +#endif # undef MBS_SUPPORT +# define MBS_SUPPORT 0 + +#if ! MBS_SUPPORT +# undef MB_CUR_MAX +# define MB_CUR_MAX 1 #endif -- cgit v1.2.3 From bc5591ac396525b1cf2a2e43f4396b4b854edd9b Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Wed, 21 Sep 2011 22:08:11 +0300 Subject: Additional mbs fixes. --- mbsupport.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'mbsupport.h') diff --git a/mbsupport.h b/mbsupport.h index 4b71019d..4c9e9bfb 100644 --- a/mbsupport.h +++ b/mbsupport.h @@ -57,8 +57,6 @@ #else # define MBS_SUPPORT 0 #endif -# undef MBS_SUPPORT -# define MBS_SUPPORT 0 #if ! MBS_SUPPORT # undef MB_CUR_MAX -- cgit v1.2.3 From 997dbc7f520c811e4c5325b9536f72cb454560cc Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Wed, 21 Sep 2011 22:45:28 +0300 Subject: Make no mbs support work everywhere. Sheesh. --- mbsupport.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mbsupport.h') diff --git a/mbsupport.h b/mbsupport.h index 4c9e9bfb..6008da77 100644 --- a/mbsupport.h +++ b/mbsupport.h @@ -36,6 +36,8 @@ #include #endif +#ifndef NO_MBSUPPORT + #if defined(HAVE_ISWCTYPE) \ && defined(HAVE_LOCALE_H) \ && defined(HAVE_MBRLEN) \ @@ -58,6 +60,10 @@ # define MBS_SUPPORT 0 #endif +#else /* NO_MBSUPPORT is defined */ +# define MBS_SUPPORT 0 +#endif + #if ! MBS_SUPPORT # undef MB_CUR_MAX # define MB_CUR_MAX 1 -- cgit v1.2.3