X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fconfig.h;h=10c6f6548f6c78e2c3d1d0dd0c69f48c0a01161f;hb=7097fa9587972b0fba1f40172e4c20a908f602df;hp=68d688a8b5776405c3e2916b1b1dd24cb5358c3d;hpb=1571781022499a9d0c32d249f89945d034d1cbff;p=libucw.git diff --git a/lib/config.h b/lib/config.h index 68d688a8..10c6f654 100644 --- a/lib/config.h +++ b/lib/config.h @@ -1,79 +1,48 @@ /* - * Sherlock Library -- Configuration-Dependent Definitions + * UCW Library -- Configuration-Dependent Definitions * - * (c) 1997--2000 Martin Mares + * (c) 1997--2007 Martin Mares + * (c) 2006 Robert Spalek + * + * 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 */ - -#define SHER_VER "2.0-alpha" - -/* Features */ - -#define SHERLOCK_CONFIG_LARGE_DB /* Support for DB files >4GB */ -#define SHERLOCK_CONFIG_LFS /* Large files on 32-bit systems */ -#undef SHERLOCK_CONFIG_LFS_LIBC /* LFS supported directly by libc */ +#ifndef _UCW_CONFIG_H +#define _UCW_CONFIG_H -/* Types */ - -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 */ - -#ifndef NULL -#define NULL (void *)0 -#endif +/* Configuration switches */ -typedef u32 oid_t; /* Object ID */ +#include "autoconf.h" -#ifdef SHERLOCK_CONFIG_LFS /* off_t as passed to file functions */ -typedef s64 sh_off_t; -#define BYTES_PER_FILE_POINTER 5 -#else -typedef int sh_off_t; -#define BYTES_PER_FILE_POINTER 4 -#endif +/* Tell libc we're going to use all extensions available */ -#ifdef SHERLOCK_CONFIG_LARGE_DB /* off_t as present in database files */ -typedef s64 sh_foff_t; -#else -typedef s32 sh_foff_t; +#ifndef _GNU_SOURCE +#define _GNU_SOURCE #endif -/* CPU characteristics */ - -#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 +/* Types (based on standard C99 integers) */ -/* Misc */ +#include +#include -#ifdef __GNUC__ +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 */ -#undef inline -#define NONRET __attribute__((noreturn)) -#define UNUSED __attribute__((unused)) +typedef unsigned int uns; /* at least 32 bits */ +typedef u32 sh_time_t; /* Timestamp */ +#ifdef CONFIG_LARGE_FILES /* File positions */ +typedef s64 sh_off_t; #else - -#define inline -#define NONRET -#define UNUSED - +typedef s32 sh_off_t; #endif #endif