diff options
| author | mp <mp@FreeBSD.org> | 2007-03-11 22:33:41 +0000 |
|---|---|---|
| committer | mp <mp@FreeBSD.org> | 2007-03-11 22:33:41 +0000 |
| commit | a40980339b13e3b506c2317b5b4864127039eb2c (patch) | |
| tree | 34aefea92d30b614247ef1f2671f2362f4761785 /contrib/tcsh/config_f.h | |
| parent | 32837fb336d4709f0a121130a3a78f29be0db5ed (diff) | |
| download | FreeBSD-src-a40980339b13e3b506c2317b5b4864127039eb2c.zip FreeBSD-src-a40980339b13e3b506c2317b5b4864127039eb2c.tar.gz | |
Import of tcsh-6.15.00
Diffstat (limited to 'contrib/tcsh/config_f.h')
| -rw-r--r-- | contrib/tcsh/config_f.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/contrib/tcsh/config_f.h b/contrib/tcsh/config_f.h index 2f3f403..aee7363 100644 --- a/contrib/tcsh/config_f.h +++ b/contrib/tcsh/config_f.h @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/config_f.h,v 3.32 2005/03/04 13:46:04 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/config_f.h,v 3.40 2006/08/28 14:53:04 mitr Exp $ */ /* * config_f.h -- configure various defines for tcsh * @@ -50,26 +50,20 @@ * WIDE_STRINGS Represent strings using wide characters * Allows proper function in multibyte encodings like UTF-8 */ -#if defined (SHORT_STRINGS) && SIZEOF_WCHAR_T >= 4 && !defined (WINNT_NATIVE) && !defined(_OSD_POSIX) +#if defined (SHORT_STRINGS) && defined (NLS) && SIZEOF_WCHAR_T >= 4 && defined (HAVE_MBRTOWC) && !defined (WINNT_NATIVE) && !defined(_OSD_POSIX) # define WIDE_STRINGS #endif /* - * NLS: Use Native Language System - * Routines like setlocale() are needed - * if you don't have <locale.h>, you don't want - * to define this. - */ -#define NLS - -/* * NLS_CATALOGS:Use Native Language System catalogs for * international messages. * Routines like catopen() are needed * if you don't have <nl_types.h>, you don't want * to define this. */ -#undef NLS_CATALOGS +#if defined (NLS) && defined (HAVE_CATGETS) +# define NLS_CATALOGS +#endif /* * LOGINFIRST Source ~/.login before ~/.cshrc @@ -149,7 +143,7 @@ * This can be much slower and no memory statistics will be * provided. */ -#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) +#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__linux__) # define SYSMALLOC #else # undef SYSMALLOC |
