--- truecrypt/common/cmdline.h	2018/04/24 16:42:55	1.1.1.6
+++ truecrypt/common/cmdline.h	2018/04/24 17:06:20	1.1.1.16
@@ -1,19 +1,27 @@
-/* Legal Notice: The source code contained in this file has been derived from
-   the source code of Encryption for the Masses 2.02a, which is Copyright (c)
-   1998-99 Paul Le Roux and which is covered by the 'License Agreement for
-   Encryption for the Masses'. Modifications and additions to that source code
-   contained in this file are Copyright (c) 2004-2005 TrueCrypt Foundation and
-   Copyright (c) 2004 TrueCrypt Team, and are covered by TrueCrypt License 2.0
-   the full text of which is contained in the file License.txt included in
-   TrueCrypt binary and source code distribution archives.  */
+/*
+ Legal Notice: Some portions of the source code contained in this file were
+ derived from the source code of Encryption for the Masses 2.02a, which is
+ Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
+ Agreement for Encryption for the Masses'. Modifications and additions to
+ the original source code (contained in this file) and all other portions
+ of this file are Copyright (c) 2003-2008 TrueCrypt Developers Association
+ and are governed by the TrueCrypt License 2.8 the full text of which is
+ contained in the file License.txt included in TrueCrypt binary and source
+ code distribution packages. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define HAS_ARGUMENT	1
 #define HAS_NO_ARGUMENT !HAS_ARGUMENT
 
 typedef struct argument_t
 {
-	char long_name[16];
+	int Id;
+	char long_name[32];
 	char short_name[8];
+	BOOL Internal;
 } argument;
 
 typedef struct argumentspec_t
@@ -22,8 +30,12 @@ typedef struct argumentspec_t
 	int		 arg_cnt;
 } argumentspec;
 
-BOOL WINAPI CommandHelpDlgProc ( HWND hwndDlg , UINT msg , WPARAM wParam , LPARAM lParam );
+BOOL CALLBACK CommandHelpDlgProc ( HWND hwndDlg , UINT msg , WPARAM wParam , LPARAM lParam );
 int Win32CommandLine ( char *lpszCommandLine , char ***lpszArgs );
 int GetArgSepPosOffset ( char *lpszArgument );
 int GetArgumentID ( argumentspec *as , char *lpszArgument , int *nArgPos );
 int GetArgumentValue ( char **lpszCommandLineArgs , int nArgPos , int *nArgIdx , int nNoCommandLineArgs , char *lpszValue , int nValueSize );
+
+#ifdef __cplusplus
+}
+#endif