X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fconfig.h;h=72be2f98826d12a36d59e313ce0daf69aae180d9;hb=d047dae8f369ac5cbc3dedf8907b2c05694bb892;hp=3c06a4700efe87ab55ef2d534ddcdc81f5976540;hpb=ac9212c1d03bd23f6322bef39a4a0384b5afcc5d;p=libucw.git diff --git a/lib/config.h b/lib/config.h index 3c06a470..72be2f98 100644 --- a/lib/config.h +++ b/lib/config.h @@ -1,50 +1,48 @@ /* - * Sherlock Library -- Configuration-Dependent Definitions + * UCW Library -- Configuration-Dependent Definitions * - * (c) 1997 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 */ +#ifndef _UCW_CONFIG_H +#define _UCW_CONFIG_H -#define SHER_VER "1.0" +/* Configuration switches */ -/* Types */ +#include "lib/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 int ulg; /* exactly 32 bits, unsigned */ -typedef int slg; /* exactly 32 bits, signed */ -typedef unsigned int uns; /* at least 32 bits */ +/* Tell libc we're going to use all extensions available */ -#ifndef NULL -#define NULL (void *)0 +#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)) +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 - +typedef s32 sh_off_t; #endif #endif