X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.h;h=6f24c6d57253f2f65da05c2d4237f5edbe8ef838;hb=66f968af299fe8ce6ba65b38fd3cb477e9112818;hp=8411bae746ef77ab54216b22c96f36fccfc33e76;hpb=ee72adbf76eebfc0c16ecd689149847cd6d210c9;p=libucw.git diff --git a/lib/config.h b/lib/config.h index 8411bae7..6f24c6d5 100644 --- a/lib/config.h +++ b/lib/config.h @@ -2,6 +2,7 @@ * UCW Library -- Configuration-Dependent Definitions * * (c) 1997--2004 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. @@ -18,6 +19,8 @@ typedef unsigned char byte; /* exactly 8 bits, unsigned */ typedef signed char sbyte; /* exactly 8 bits, signed */ +typedef unsigned char u8; /* exactly 8 bits, unsigned */ +typedef signed char s8; /* 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 */ @@ -34,6 +37,24 @@ typedef unsigned int sh_time_t; /* Timestamp */ #define NULL (void *)0 #endif -typedef s64 sh_off_t; /* FIXME */ +#ifdef CONFIG_LARGE_FILES /* File positions */ +typedef s64 sh_off_t; +#else +typedef s32 sh_off_t; +#endif + +#ifdef CPU_64BIT_POINTERS +#define BYTES_PER_P 8 +#define bgetp(f) bgetq(f) +#define bputp(f,l) bputq(f,l) +#define GET_P(p) GET_U64(p) +#define PUT_P(p,x) PUT_U64(p,x) +#else +#define BYTES_PER_P 4 +#define bgetp(f) bgetl(f) +#define bputp(f,l) bputl(f,l) +#define GET_P(p) GET_U32(p) +#define PUT_P(p,x) PUT_U32(p,x) +#endif #endif