kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
David Cole 2012-04-25 14:04:52 -04:00 committed by CMake Topic Stage
parent 91f83347d3 b3c77889e4
commit 7e4c11e0fc
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmFileCommand.cxx
View File

@ -300,7 +300,7 @@ bool cmFileCommand::HandleReadCommand(std::vector<std::string> const& args)
offset = atoi(offsetArg.GetCString()); offset = atoi(offsetArg.GetCString());
} }
file.seekg(offset); file.seekg(offset, std::ios::beg); // explicit ios::beg for IBM VisualAge 6
std::string output; std::string output;

3
Utilities/cmlibarchive/libarchive/archive_endian.h
View File

@ -44,9 +44,12 @@
* - Watcom C++ in C code. (For any version?) * - Watcom C++ in C code. (For any version?)
* - SGI MIPSpro * - SGI MIPSpro
* - Microsoft Visual C++ 6.0 (supposedly newer versions too) * - Microsoft Visual C++ 6.0 (supposedly newer versions too)
* - IBM VisualAge 6 (XL v6)
*/ */
#if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__) #if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__)
#define inline #define inline
#elif defined(__IBMC__) && __IBMC__ < 700
#define inline
#elif defined(_MSC_VER) || defined(__osf__) #elif defined(_MSC_VER) || defined(__osf__)
#define inline __inline #define inline __inline
#endif #endif

10
Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
View File

@ -197,7 +197,7 @@ struct isofile {
enum { enum {
NO = 0, NO = 0,
BOOT_CATALOG, BOOT_CATALOG,
BOOT_IMAGE, BOOT_IMAGE
} boot; } boot;
/* /*
@ -850,7 +850,7 @@ enum dir_rec_type {
DIR_REC_VD, /* Stored in Volume Descriptor. */ DIR_REC_VD, /* Stored in Volume Descriptor. */
DIR_REC_SELF, /* Stored as Current Directory. */ DIR_REC_SELF, /* Stored as Current Directory. */
DIR_REC_PARENT, /* Stored as Parent 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_STD,
VDC_LOWERCASE, VDC_LOWERCASE,
VDC_UCS2, VDC_UCS2,
VDC_UCS2_DIRECT, VDC_UCS2_DIRECT
}; };
/* /*
@ -897,7 +897,7 @@ struct idr {
enum char_type { enum char_type {
A_CHAR, A_CHAR,
D_CHAR, D_CHAR
}; };
@ -3989,7 +3989,7 @@ enum keytype {
KEY_FLG, KEY_FLG,
KEY_STR, KEY_STR,
KEY_INT, KEY_INT,
KEY_HEX, KEY_HEX
}; };
static void static void
set_option_info(struct archive_string *info, int *opt, const char *key, set_option_info(struct archive_string *info, int *opt, const char *key,