summaryrefslogtreecommitdiffstats
path: root/lib/libmagic
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2010-05-20 08:56:50 +0000
committermarius <marius@FreeBSD.org>2010-05-20 08:56:50 +0000
commit5dc0270149b0451ab22650bdfabefabe8584d5ab (patch)
tree92967f6d90c4f8fa1ed5c291f5754246971ca9b8 /lib/libmagic
parent598e4abcd1e7291691a6906cb11637667cef2c42 (diff)
downloadFreeBSD-src-5dc0270149b0451ab22650bdfabefabe8584d5ab.zip
FreeBSD-src-5dc0270149b0451ab22650bdfabefabe8584d5ab.tar.gz
Update to a config.h created by a file 5.03 configure script. This causes
file.1 to contain the correct version number and SIZEOF_LONG_LONG to be defined as appropriate, which is crucial for 64-bit big-endian ELF files to be handled correctly on big-endian systems. PR: 146387 Reviewed by: delphij MFC after: 3 days
Diffstat (limited to 'lib/libmagic')
-rw-r--r--lib/libmagic/config.h95
1 files changed, 57 insertions, 38 deletions
diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h
index 1e97361..8574ddc 100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@ -1,18 +1,18 @@
/* $FreeBSD$ */
/* config.h. Generated from config.h.in by configure. */
-/* config.h.in. Generated from configure.in by autoheader. */
+/* config.h.in. Generated from configure.ac by autoheader. */
-/* Use the builtin ELF recognition code */
+/* Define in built-in ELF support is used */
#define BUILTIN_ELF 1
-/* Recognize ELF core files */
+/* Define for ELF core file support */
#define ELFCORE 1
/* Define to 1 if you have the `asprintf' function. */
#define HAVE_ASPRINTF 1
-/* */
+/* HAVE_DAYLIGHT */
/* #undef HAVE_DAYLIGHT */
/* Define to 1 if you have the <dlfcn.h> header file. */
@@ -51,9 +51,6 @@
/* Define to 1 if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
-/* */
-#define HAVE_LONG_LONG 1
-
/* Define to 1 if you have the `mbrtowc' function. */
#define HAVE_MBRTOWC 1
@@ -69,9 +66,6 @@
/* Define to 1 if you have the `mmap' function. */
#define HAVE_MMAP 1
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@@ -102,13 +96,12 @@
/* Define to 1 if you have the `strtoul' function. */
#define HAVE_STRTOUL 1
+/* HAVE_STRUCT_OPTION */
+#define HAVE_STRUCT_OPTION 1
+
/* Define to 1 if `st_rdev' is member of `struct stat'. */
#define HAVE_STRUCT_STAT_ST_RDEV 1
-/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
- `HAVE_STRUCT_STAT_ST_RDEV' instead. */
-#define HAVE_ST_RDEV 1
-
/* Define to 1 if `tm_gmtoff' is member of `struct tm'. */
#define HAVE_STRUCT_TM_TM_GMTOFF 1
@@ -133,7 +126,7 @@
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#define HAVE_SYS_WAIT_H 1
-/* */
+/* HAVE_TM_ISDST */
#define HAVE_TM_ISDST 1
/* HAVE_TM_ZONE */
@@ -169,9 +162,6 @@
/* Define to 1 if you have the `vasprintf' function. */
#define HAVE_VASPRINTF 1
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-
/* Define to 1 if you have the <wchar.h> header file. */
#define HAVE_WCHAR_H 1
@@ -199,34 +189,22 @@
#define PACKAGE "file"
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
+#define PACKAGE_BUGREPORT "christos@astron.com"
/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
+#define PACKAGE_NAME "file"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
+#define PACKAGE_STRING "file 5.03"
/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
+#define PACKAGE_TARNAME "file"
/* Define to the version of this package. */
-#define PACKAGE_VERSION VERSION
-
-/* */
-#define SIZEOF_INT64_T 8
+#define PACKAGE_VERSION "5.03"
-/* */
-#define SIZEOF_UINT16_T 2
-
-/* */
-#define SIZEOF_UINT32_T 4
-
-/* */
-#define SIZEOF_UINT64_T 8
-
-/* */
-#define SIZEOF_UINT8_T 1
+/* The size of `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -235,7 +213,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "5.00"
+#define VERSION "5.03"
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
@@ -247,8 +225,49 @@
#endif
#endif
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+/* #undef _LARGEFILE_SOURCE */
+
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
+
+/* Define to a type if <wchar.h> does not define. */
+/* #undef mbstate_t */
+
+/* Define to `long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+
+#ifndef HAVE_UINT8_T
+typedef unsigned char uint8_t;
+#endif
+#ifndef HAVE_UINT16_T
+typedef unsigned short uint16_t;
+#endif
+#ifndef HAVE_UINT32_T
+typedef unsigned int uint32_t;
+#endif
+#ifndef HAVE_INT32_T
+typedef int int32_t;
+#endif
+#ifndef HAVE_UINT64_T
+#if SIZEOF_LONG_LONG == 8
+typedef unsigned long long uint64_t;
+#else
+typedef unsigned long uint64_t;
+#endif
+#endif
+#ifndef HAVE_INT64_T
+#if SIZEOF_LONG_LONG == 8
+typedef long long int64_t;
+#else
+typedef long int64_t;
+#endif
+#endif
+
OpenPOWER on IntegriCloud