Merge remote-tracking branch 'origin/master'

[libucw.git] / ucw / config.h

diff --git a/ucw/config.h b/ucw/config.h
index ffe61fc9599522dde9d3c9e7d8d293b01b87b3b5..a4768b721f073ed5c6e0769458ccd0c3d1244f00 100644 (file)
--- a/ucw/config.h
+++ b/ucw/config.h
@@ -37,10 +37,11 @@ typedef uint64_t u64;                       /** Exactly 64 bits, unsigned **/
 typedef int64_t s64;                   /** Exactly 64 bits, signed **/
 
 typedef unsigned int uint;             /** A better pronounceable alias for `unsigned int` **/
 typedef int64_t s64;                   /** Exactly 64 bits, signed **/
 
 typedef unsigned int uint;             /** A better pronounceable alias for `unsigned int` **/

-// FIXME
-// typedef uint uns;                   /** Backwards compatible alias for `uint' ***/

 typedef s64 timestamp_t;               /** Milliseconds since an unknown epoch **/
 
 typedef s64 timestamp_t;               /** Milliseconds since an unknown epoch **/
 

+// 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
 #ifdef CONFIG_UCW_LARGE_FILES
 typedef s64 ucw_off_t;                 /** File position (either 32- or 64-bit, depending on `CONFIG_UCW_LARGE_FILES`). **/
 #else