diff options
| author | obrien <obrien@FreeBSD.org> | 2008-01-13 20:37:19 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2008-01-13 20:37:19 +0000 |
| commit | e7d969a2b50ffa17766fa43b7cff8be9a5b637c9 (patch) | |
| tree | 603b6ae2f23fca6e1f8a64267fe9ac923ad15b11 | |
| parent | a9a31187c8fb3c8aac14c2dbb32f6c41024866fb (diff) | |
| download | FreeBSD-src-e7d969a2b50ffa17766fa43b7cff8be9a5b637c9.zip FreeBSD-src-e7d969a2b50ffa17766fa43b7cff8be9a5b637c9.tar.gz | |
Update for the 'file' 4.23 import.
| -rw-r--r-- | lib/libmagic/config.h | 27 | ||||
| -rw-r--r-- | usr.bin/file/config.h | 27 |
2 files changed, 46 insertions, 8 deletions
diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index 6ec80bf..65e4a6a 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -2,7 +2,7 @@ #include <osreldate.h> -/* config.h. Generated by configure. */ +/* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ /* Use the builtin ELF recognition code */ @@ -79,6 +79,9 @@ /* Define to 1 if you have the `strndup' function. */ /* #undef HAVE_STRNDUP */ +/* Define to 1 if you have the `strtof' function. */ +#define HAVE_STRTOF 1 + /* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 @@ -140,6 +143,9 @@ /* Define to 1 if you have the `wcwidth' function. */ #define HAVE_WCWIDTH 1 +/* Define to 1 if you have the <zlib.h> header file. */ +#define HAVE_ZLIB_H 1 + /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. */ /* #undef MAJOR_IN_MKDEV */ @@ -167,6 +173,9 @@ #define PACKAGE_VERSION "" /* */ +#define SIZEOF_INT64_T 8 + +/* */ #define SIZEOF_UINT16_T 2 /* */ @@ -185,11 +194,18 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "4.21" +#define VERSION "4.23" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ +/* Enable GNU extensions on systems that have them. */ +#ifndef __FreeBSD__ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +#endif + /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ @@ -199,13 +215,16 @@ /* */ /* #undef int32_t */ +/* */ +/* #undef int64_t */ + /* Define to a type if <wchar.h> does not define. */ /* #undef mbstate_t */ -/* Define to `long' if <sys/types.h> does not define. */ +/* Define to `long int' if <sys/types.h> does not define. */ /* #undef off_t */ -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ /* #undef size_t */ /* */ diff --git a/usr.bin/file/config.h b/usr.bin/file/config.h index 6ec80bf..65e4a6a 100644 --- a/usr.bin/file/config.h +++ b/usr.bin/file/config.h @@ -2,7 +2,7 @@ #include <osreldate.h> -/* config.h. Generated by configure. */ +/* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ /* Use the builtin ELF recognition code */ @@ -79,6 +79,9 @@ /* Define to 1 if you have the `strndup' function. */ /* #undef HAVE_STRNDUP */ +/* Define to 1 if you have the `strtof' function. */ +#define HAVE_STRTOF 1 + /* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 @@ -140,6 +143,9 @@ /* Define to 1 if you have the `wcwidth' function. */ #define HAVE_WCWIDTH 1 +/* Define to 1 if you have the <zlib.h> header file. */ +#define HAVE_ZLIB_H 1 + /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. */ /* #undef MAJOR_IN_MKDEV */ @@ -167,6 +173,9 @@ #define PACKAGE_VERSION "" /* */ +#define SIZEOF_INT64_T 8 + +/* */ #define SIZEOF_UINT16_T 2 /* */ @@ -185,11 +194,18 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "4.21" +#define VERSION "4.23" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ +/* Enable GNU extensions on systems that have them. */ +#ifndef __FreeBSD__ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +#endif + /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ @@ -199,13 +215,16 @@ /* */ /* #undef int32_t */ +/* */ +/* #undef int64_t */ + /* Define to a type if <wchar.h> does not define. */ /* #undef mbstate_t */ -/* Define to `long' if <sys/types.h> does not define. */ +/* Define to `long int' if <sys/types.h> does not define. */ /* #undef off_t */ -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ /* #undef size_t */ /* */ |
