diff options
author | delphij <delphij@FreeBSD.org> | 2007-11-16 22:24:31 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2007-11-16 22:24:31 +0000 |
commit | 12ee5edf2f2943fb7ff47149c5bfba7f36b865b2 (patch) | |
tree | 840e6427c104a75a42837ced5e3276f0d2f98534 /usr.bin/less | |
parent | 6c8bd91302f47331d99af5e633b06e68121fd73d (diff) | |
download | FreeBSD-src-12ee5edf2f2943fb7ff47149c5bfba7f36b865b2.zip FreeBSD-src-12ee5edf2f2943fb7ff47149c5bfba7f36b865b2.tar.gz |
Resolve conflicts; Update defines.h to reflect latest change.
Diffstat (limited to 'usr.bin/less')
-rw-r--r-- | usr.bin/less/defines.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/usr.bin/less/defines.h b/usr.bin/less/defines.h index 43b28b5..bc1b717 100644 --- a/usr.bin/less/defines.h +++ b/usr.bin/less/defines.h @@ -284,6 +284,9 @@ /* Define to 1 if you have the `stat' function. */ #define HAVE_STAT 1 +/* Define HAVE_STAT_INO if your struct stat has st_ino and st_dev. */ +#define HAVE_STAT_INO 1 + /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -353,6 +356,12 @@ /* Define HAVE_VOID if your compiler supports the "void" type. */ #define HAVE_VOID 1 +/* Define HAVE_WCTYPE if you have iswupper, iswlower, towupper, towlower. */ +#define HAVE_WCTYPE 1 + +/* Define to 1 if you have the <wctype.h> header file. */ +#define HAVE_WCTYPE_H 1 + /* Define to 1 if you have the `_setjmp' function. */ #define HAVE__SETJMP 1 |