/*
- * Sherlock Library -- Configuration-Dependent Definitions
+ * UCW Library -- Configuration-Dependent Definitions
*
- * (c) 1997--1999 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
+ * (c) 1997--2007 Martin Mares <mj@ucw.cz>
+ * (c) 2006 Robert Spalek <robert@ucw.cz>
+ *
+ * This software may be freely distributed and used according to the terms
+ * of the GNU Lesser General Public License.
*/
-#ifndef _SHERLOCK_CONFIG_H
-#define _SHERLOCK_CONFIG_H
-
-/* Version */
+#ifndef _UCW_CONFIG_H
+#define _UCW_CONFIG_H
-#define SHER_VER "1.2"
+/* Configuration switches */
-/* Types */
+#include "autoconf.h"
-typedef unsigned char byte; /* exactly 8 bits, unsigned */
-typedef signed char sbyte; /* exactly 8 bits, signed */
-typedef unsigned short word; /* exactly 16 bits, unsigned */
-typedef short sword; /* exactly 16 bits, signed */
-typedef unsigned short u16; /* exactly 16 bits, unsigned */
-typedef short s16; /* exactly 16 bits, signed */
-typedef unsigned int u32; /* exactly 32 bits, unsigned */
-typedef int s32; /* exactly 32 bits, signed */
-typedef unsigned int uns; /* at least 32 bits */
-typedef unsigned long long int u64; /* exactly 64 bits, unsigned */
-typedef long long int s64; /* exactly 64 bits, signed */
-typedef unsigned long addr_int_t; /* Both integer and address */
+/* Tell libc we're going to use all extensions available */
-#ifndef NULL
-#define NULL (void *)0
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
#endif
-typedef u32 oid_t; /* Object ID */
-
-/* CPU characteristics */
+/* Types (based on standard C99 integers) */
-#define CPU_LITTLE_ENDIAN
-#undef CPU_BIG_ENDIAN
-#define CPU_CAN_DO_UNALIGNED_WORDS
-#define CPU_CAN_DO_UNALIGNED_LONGS
-#define CPU_STRUCT_ALIGN 4
+#include <stddef.h>
+#include <stdint.h>
-/* Misc */
+typedef uint8_t byte; /* exactly 8 bits, unsigned */
+typedef uint8_t u8; /* exactly 8 bits, unsigned */
+typedef int8_t s8; /* exactly 8 bits, signed */
+typedef uint16_t u16; /* exactly 16 bits, unsigned */
+typedef int16_t s16; /* exactly 16 bits, signed */
+typedef uint32_t u32; /* exactly 32 bits, unsigned */
+typedef int32_t s32; /* exactly 32 bits, signed */
+typedef uint64_t u64; /* exactly 64 bits, unsigned */
+typedef int64_t s64; /* exactly 64 bits, signed */
-#ifdef __GNUC__
-
-#undef inline
-#define NONRET __attribute__((noreturn))
+typedef unsigned int uns; /* at least 32 bits */
+typedef u32 sh_time_t; /* seconds since UNIX epoch */
+typedef s64 timestamp_t; /* milliseconds since UNIX epoch */
+#ifdef CONFIG_LARGE_FILES /* File positions */
+typedef s64 sh_off_t;
#else
-
-#define inline
-#define NONRET
-
+typedef s32 sh_off_t;
#endif
#endif