Merge topic 'compile-XL-v6'
b3c7788
Workaround IBM XL v6 streams seekg bug (#13149)09a91c6
libarchive: Avoid 'inline' keyword on XL C v6 (#13148)a8995eb
libarchive: Avoid trailing , in enum for XL v6 (#13148)
This commit is contained in:
commit
7e4c11e0fc
|
@ -300,7 +300,7 @@ bool cmFileCommand::HandleReadCommand(std::vector<std::string> const& args)
|
|||
offset = atoi(offsetArg.GetCString());
|
||||
}
|
||||
|
||||
file.seekg(offset);
|
||||
file.seekg(offset, std::ios::beg); // explicit ios::beg for IBM VisualAge 6
|
||||
|
||||
std::string output;
|
||||
|
||||
|
|
|
@ -44,9 +44,12 @@
|
|||
* - Watcom C++ in C code. (For any version?)
|
||||
* - SGI MIPSpro
|
||||
* - Microsoft Visual C++ 6.0 (supposedly newer versions too)
|
||||
* - IBM VisualAge 6 (XL v6)
|
||||
*/
|
||||
#if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__)
|
||||
#define inline
|
||||
#elif defined(__IBMC__) && __IBMC__ < 700
|
||||
#define inline
|
||||
#elif defined(_MSC_VER) || defined(__osf__)
|
||||
#define inline __inline
|
||||
#endif
|
||||
|
|
|
@ -197,7 +197,7 @@ struct isofile {
|
|||
enum {
|
||||
NO = 0,
|
||||
BOOT_CATALOG,
|
||||
BOOT_IMAGE,
|
||||
BOOT_IMAGE
|
||||
} boot;
|
||||
|
||||
/*
|
||||
|
@ -850,7 +850,7 @@ enum dir_rec_type {
|
|||
DIR_REC_VD, /* Stored in Volume Descriptor. */
|
||||
DIR_REC_SELF, /* Stored as Current Directory. */
|
||||
DIR_REC_PARENT, /* Stored as Parent Directory. */
|
||||
DIR_REC_NORMAL, /* Stored as Child. */
|
||||
DIR_REC_NORMAL /* Stored as Child. */
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -860,7 +860,7 @@ enum vdc {
|
|||
VDC_STD,
|
||||
VDC_LOWERCASE,
|
||||
VDC_UCS2,
|
||||
VDC_UCS2_DIRECT,
|
||||
VDC_UCS2_DIRECT
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -897,7 +897,7 @@ struct idr {
|
|||
|
||||
enum char_type {
|
||||
A_CHAR,
|
||||
D_CHAR,
|
||||
D_CHAR
|
||||
};
|
||||
|
||||
|
||||
|
@ -3989,7 +3989,7 @@ enum keytype {
|
|||
KEY_FLG,
|
||||
KEY_STR,
|
||||
KEY_INT,
|
||||
KEY_HEX,
|
||||
KEY_HEX
|
||||
};
|
||||
static void
|
||||
set_option_info(struct archive_string *info, int *opt, const char *key,
|
||||
|
|
Loading…
Reference in New Issue