--- truecrypt/common/tcdefs.h	2018/04/24 16:40:43	1.1.1.5
+++ truecrypt/common/tcdefs.h	2018/04/24 16:42:07	1.1.1.7
@@ -1,25 +1,31 @@
 /* The source code contained in this file has been derived from the source code
    of Encryption for the Masses 2.02a by Paul Le Roux. Modifications and
    additions to that source code contained in this file are Copyright (c) 2004
-   TrueCrypt Team and Copyright (c) 2004 TrueCrypt Foundation. Unmodified
+   TrueCrypt Foundation and Copyright (c) 2004 TrueCrypt Team. Unmodified
    parts are Copyright (c) 1998-99 Paul Le Roux. This is a TrueCrypt Foundation
    release. Please see the file license.txt for full license details. */
 
 // Version displayed to user 
-#define VERSION_STRING                  "2.1a"
+#define VERSION_STRING                  "3.1"
 
 // Version number to compare against driver
-#define VERSION_NUM						0x0210
+#define VERSION_NUM						0x0310
 
 // Version number written to volume header during format,
 // specifies the minimum program version required to mount the volume
-#define VOLUME_VERSION_NUM				0x0100 
+#define VOL_REQ_PROG_VERSION			0x0100 
+
+// Volume header version
+#define VOLUME_HEADER_VERSION			0x0002 
 
 #define TC_MAX_PATH						260	/* Includes the null terminator */
 #define SECTOR_SIZE                     512	/* sector size */
 
-#define BYTES_PER_KB                    1024	
-#define BYTES_PER_MB                    1048576
+#define BYTES_PER_KB                    1024I64
+#define BYTES_PER_MB                    1048576I64
+#define BYTES_PER_GB                    1073741824I64
+#define BYTES_PER_TB                    1099511627776I64
+#define BYTES_PER_PB                    1125899906842624I64
 
 /* GUI/driver errors */
 
@@ -49,8 +55,14 @@
 #define ERR_INVALID_DEVICE              37
 #define ERR_ACCESS_DENIED               38
 
+#define ERR_DONT_REPORT                 100
+
 #define MIN_VOLUME_SIZE                 19456
+#define MIN_HIDDEN_VOLUME_HOST_SIZE     ( MIN_VOLUME_SIZE * 2 + HIDDEN_VOL_HEADER_OFFSET + HEADER_SIZE )
 #define MAX_VOLUME_SIZE                 0x7fffFFFFffffFFFFI64
+#define MAX_FAT_VOLUME_SIZE				0xFFFFFFFE00I64		// Should be possible to increase up to 0x1FFFFFFFC00I64 (untested)
+#define MAX_HIDDEN_VOLUME_HOST_SIZE     MAX_FAT_VOLUME_SIZE
+#define MAX_HIDDEN_VOLUME_SIZE          ( MAX_HIDDEN_VOLUME_HOST_SIZE - HIDDEN_VOL_HEADER_OFFSET - HEADER_SIZE )
 
 #define burn(mem,size) \
 	memset(mem,0xff,size); \
@@ -162,7 +174,7 @@ typedef unsigned int UINT;
 typedef unsigned long LRESULT;
 #endif
 
-#else
+#else	// #ifdef DEVICE_DRIVER
 
 #define TCalloc malloc
 #define TCfree free