Merge remote-tracking branch 'origin/master'

[libucw.git] / ucw / config.h

diff --git a/ucw/config.h b/ucw/config.h
index a43e9ea5e2bde7454bae1c67fcd2bf729928f5cb..a4768b721f073ed5c6e0769458ccd0c3d1244f00 100644 (file)
--- a/ucw/config.h
+++ b/ucw/config.h
@@ -1,7 +1,7 @@
 /*
  *     UCW Library -- Configuration-Dependent Definitions
  *
- *     (c) 1997--2009 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2012 Martin Mares <mj@ucw.cz>
  *     (c) 2006 Robert Spalek <robert@ucw.cz>
  *
  *     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