X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=ucw%2Fconfig.h;h=a4768b721f073ed5c6e0769458ccd0c3d1244f00;hb=ec6703bb4d58e504fde8ea8429f9b26ab6632696;hp=a43e9ea5e2bde7454bae1c67fcd2bf729928f5cb;hpb=2ac260ae8694188410a408cd8c379a2fe45e4ee5;p=libucw.git diff --git a/ucw/config.h b/ucw/config.h index a43e9ea5..a4768b72 100644 --- a/ucw/config.h +++ b/ucw/config.h @@ -1,7 +1,7 @@ /* * UCW Library -- Configuration-Dependent Definitions * - * (c) 1997--2009 Martin Mares + * (c) 1997--2012 Martin Mares * (c) 2006 Robert Spalek * * This software may be freely distributed and used according to the terms @@ -36,12 +36,14 @@ typedef int32_t s32; /** Exactly 32 bits, signed **/ typedef uint64_t u64; /** Exactly 64 bits, unsigned **/ typedef int64_t s64; /** Exactly 64 bits, signed **/ -typedef unsigned int uns; /** A better pronounceable alias for `unsigned int` **/ -typedef u32 ucw_time_t; /** Seconds since UNIX epoch **/ -typedef s64 timestamp_t; /** Milliseconds since UNIX epoch **/ +typedef unsigned int uint; /** A better pronounceable alias for `unsigned int` **/ +typedef s64 timestamp_t; /** Milliseconds since an unknown epoch **/ -#ifdef CONFIG_LARGE_FILES -typedef s64 ucw_off_t; /** File position (either 32- or 64-bit, depending on `CONFIG_LARGE_FILES`). **/ +// FIXME: This should be removed soon +typedef uint uns; /** Backwards compatible alias for `uint' ***/ + +#ifdef CONFIG_UCW_LARGE_FILES +typedef s64 ucw_off_t; /** File position (either 32- or 64-bit, depending on `CONFIG_UCW_LARGE_FILES`). **/ #else typedef s32 ucw_off_t; #endif