- Add some type casts, required by MS compiler.
This commit was SVN r16085.
Этот коммит содержится в:
родитель
8659a864e9
Коммит
a389e61330
@ -55,7 +55,7 @@ opal_installdirs_base_component_t mca_installdirs_windows_component = {
|
|||||||
cbData = 1024; \
|
cbData = 1024; \
|
||||||
valueLength = 1024; \
|
valueLength = 1024; \
|
||||||
if( ERROR_SUCCESS == RegEnumValue( (KEY), i, valueName, &valueLength, \
|
if( ERROR_SUCCESS == RegEnumValue( (KEY), i, valueName, &valueLength, \
|
||||||
NULL, &keyType, vData, &cbData ) ) { \
|
NULL, &keyType, (LPBYTE) vData, &cbData ) ) { \
|
||||||
if( ((REG_EXPAND_SZ == keyType) || (REG_SZ == keyType)) && \
|
if( ((REG_EXPAND_SZ == keyType) || (REG_SZ == keyType)) && \
|
||||||
(0 == strncasecmp( valueName, (ENVNAME), strlen((ENVNAME)) )) ) { \
|
(0 == strncasecmp( valueName, (ENVNAME), strlen((ENVNAME)) )) ) { \
|
||||||
mca_installdirs_windows_component.install_dirs_data.FIELD = strdup(vData); \
|
mca_installdirs_windows_component.install_dirs_data.FIELD = strdup(vData); \
|
||||||
|
@ -102,7 +102,7 @@ static int default_data_idx = -1;
|
|||||||
static void
|
static void
|
||||||
options_data_init(struct options_data_t *data)
|
options_data_init(struct options_data_t *data)
|
||||||
{
|
{
|
||||||
data->compiler_args = malloc(sizeof(char*));
|
data->compiler_args = (char **) malloc(sizeof(char*));
|
||||||
data->compiler_args[0] = NULL;
|
data->compiler_args[0] = NULL;
|
||||||
data->language = NULL;
|
data->language = NULL;
|
||||||
data->compiler = NULL;
|
data->compiler = NULL;
|
||||||
@ -112,13 +112,13 @@ options_data_init(struct options_data_t *data)
|
|||||||
data->compiler_env = NULL;
|
data->compiler_env = NULL;
|
||||||
data->compiler_flags_env = NULL;
|
data->compiler_flags_env = NULL;
|
||||||
data->module_option = NULL;
|
data->module_option = NULL;
|
||||||
data->preproc_flags = malloc(sizeof(char*));
|
data->preproc_flags = (char **) malloc(sizeof(char*));
|
||||||
data->preproc_flags[0] = NULL;
|
data->preproc_flags[0] = NULL;
|
||||||
data->comp_flags = malloc(sizeof(char*));
|
data->comp_flags = (char **) malloc(sizeof(char*));
|
||||||
data->comp_flags[0] = NULL;
|
data->comp_flags[0] = NULL;
|
||||||
data->link_flags = malloc(sizeof(char*));
|
data->link_flags = (char **) malloc(sizeof(char*));
|
||||||
data->link_flags[0] = NULL;
|
data->link_flags[0] = NULL;
|
||||||
data->libs = malloc(sizeof(char*));
|
data->libs = (char **) malloc(sizeof(char*));
|
||||||
data->libs[0] = NULL;
|
data->libs[0] = NULL;
|
||||||
data->req_file = NULL;
|
data->req_file = NULL;
|
||||||
data->path_includedir = NULL;
|
data->path_includedir = NULL;
|
||||||
@ -155,7 +155,7 @@ options_data_expand(const char *value)
|
|||||||
{
|
{
|
||||||
/* make space for the new set of args */
|
/* make space for the new set of args */
|
||||||
parse_options_idx++;
|
parse_options_idx++;
|
||||||
options_data = realloc(options_data, sizeof(struct options_data_t) * (parse_options_idx + 1));
|
options_data = (struct options_data_t *) realloc(options_data, sizeof(struct options_data_t) * (parse_options_idx + 1));
|
||||||
options_data_init(&(options_data[parse_options_idx]));
|
options_data_init(&(options_data[parse_options_idx]));
|
||||||
|
|
||||||
/* if there are values, this is not the default case.
|
/* if there are values, this is not the default case.
|
||||||
@ -707,7 +707,7 @@ main(int argc, char *argv[])
|
|||||||
exec_argv = opal_argv_split(options_data[user_data_idx].compiler, ' ');
|
exec_argv = opal_argv_split(options_data[user_data_idx].compiler, ' ');
|
||||||
exec_argc = opal_argv_count(exec_argv);
|
exec_argc = opal_argv_count(exec_argv);
|
||||||
} else {
|
} else {
|
||||||
exec_argv = malloc(sizeof(char*));
|
exec_argv = (char **) malloc(sizeof(char*));
|
||||||
exec_argv[0] = NULL;
|
exec_argv[0] = NULL;
|
||||||
exec_argc = 0;
|
exec_argc = 0;
|
||||||
}
|
}
|
||||||
|
@ -769,7 +769,7 @@ static int opal_ifinit(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* copy all this into a persistent form and store it in the list */
|
/* copy all this into a persistent form and store it in the list */
|
||||||
intf_ptr = malloc(sizeof(opal_if_t));
|
intf_ptr = (opal_if_t *) malloc(sizeof(opal_if_t));
|
||||||
if (NULL == intf_ptr) {
|
if (NULL == intf_ptr) {
|
||||||
opal_output (0,"opal_ifinit: Unable to malloc %d bytes",sizeof(opal_list_t));
|
opal_output (0,"opal_ifinit: Unable to malloc %d bytes",sizeof(opal_list_t));
|
||||||
return OPAL_ERR_OUT_OF_RESOURCE;
|
return OPAL_ERR_OUT_OF_RESOURCE;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user