diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 +0000 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 +0000 |
commit | f95a1b3c53bdd678b64aa608d4375660033460c3 (patch) | |
tree | a8bee40b1b14e28ff5978ea519f3035a3c399912 /PC/bdist_wininst/archive.h | |
parent | bd250300191133d276a71b395b6428081bf825b8 (diff) | |
download | cpython-git-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.gz |
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
Diffstat (limited to 'PC/bdist_wininst/archive.h')
-rw-r--r-- | PC/bdist_wininst/archive.h | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/PC/bdist_wininst/archive.h b/PC/bdist_wininst/archive.h index 35d2fd6a5f..31a7805fd1 100644 --- a/PC/bdist_wininst/archive.h +++ b/PC/bdist_wininst/archive.h @@ -14,55 +14,55 @@ */ struct eof_cdir { - long tag; /* must be 0x06054b50 */ - short disknum; - short firstdisk; - short nTotalCDirThis; - short nTotalCDir; - long nBytesCDir; - long ofsCDir; - short commentlen; + long tag; /* must be 0x06054b50 */ + short disknum; + short firstdisk; + short nTotalCDirThis; + short nTotalCDir; + long nBytesCDir; + long ofsCDir; + short commentlen; }; struct cdir { - long tag; /* must be 0x02014b50 */ - short version_made; - short version_extract; - short gp_bitflag; - short comp_method; - short last_mod_file_time; - short last_mod_file_date; - long crc32; - long comp_size; - long uncomp_size; - short fname_length; - short extra_length; - short comment_length; - short disknum_start; - short int_file_attr; - long ext_file_attr; - long ofs_local_header; + long tag; /* must be 0x02014b50 */ + short version_made; + short version_extract; + short gp_bitflag; + short comp_method; + short last_mod_file_time; + short last_mod_file_date; + long crc32; + long comp_size; + long uncomp_size; + short fname_length; + short extra_length; + short comment_length; + short disknum_start; + short int_file_attr; + long ext_file_attr; + long ofs_local_header; }; struct fhdr { - long tag; /* must be 0x04034b50 */ - short version_needed; - short flags; - short method; - short last_mod_file_time; - short last_mod_file_date; - long crc32; - long comp_size; - long uncomp_size; - short fname_length; - short extra_length; + long tag; /* must be 0x04034b50 */ + short version_needed; + short flags; + short method; + short last_mod_file_time; + short last_mod_file_date; + long crc32; + long comp_size; + long uncomp_size; + short fname_length; + short extra_length; }; struct meta_data_hdr { - int tag; - int uncomp_size; - int bitmap_size; + int tag; + int uncomp_size; + int bitmap_size; }; #pragma pack() @@ -70,29 +70,29 @@ struct meta_data_hdr { /* installation scheme */ typedef struct tagSCHEME { - char *name; - char *prefix; + char *name; + char *prefix; } SCHEME; typedef int (*NOTIFYPROC)(int code, LPSTR text, ...); extern BOOL extract_file(char *dst, char *src, int method, int comp_size, - int uncomp_size, NOTIFYPROC notify); + int uncomp_size, NOTIFYPROC notify); extern BOOL unzip_archive(SCHEME *scheme, char *dirname, char *data, - DWORD size, NOTIFYPROC notify); + DWORD size, NOTIFYPROC notify); extern char * map_new_file(DWORD flags, char *filename, char - *pathname_part, int size, - WORD wFatDate, WORD wFatTime, - NOTIFYPROC callback); + *pathname_part, int size, + WORD wFatDate, WORD wFatTime, + NOTIFYPROC callback); extern BOOL ensure_directory (char *pathname, char *new_part, - NOTIFYPROC callback); + NOTIFYPROC callback); /* codes for NOITIFYPROC */ #define DIR_CREATED 1 |