External/libvirt
1
0
Fork 0
Code

boolean shadows a typedef in rpcndr.h when compiled with MinGW

Browse Source 
Alter the offending variable names to fix this.
This commit is contained in:
Matthias Bolte 2009-12-23 04:02:26 +01:00
parent 913ab198fb
commit ca9e601fcb
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/esx/esx_vi.h
View File

@ -138,7 +138,7 @@ struct _esxVI_Enumeration {
int esxVI_Enumeration_CastFromAnyType(virConnectPtr conn, int esxVI_Enumeration_CastFromAnyType(virConnectPtr conn,
const esxVI_Enumeration *enumeration, const esxVI_Enumeration *enumeration,
esxVI_AnyType *anyType, int *boolean); esxVI_AnyType *anyType, int *value);
int esxVI_Enumeration_Serialize(virConnectPtr conn, int esxVI_Enumeration_Serialize(virConnectPtr conn,
const esxVI_Enumeration *enumeration, const esxVI_Enumeration *enumeration,
int value, const char *element, int value, const char *element,

4
src/esx/esx_vi_types.h
View File

@ -131,11 +131,11 @@ enum _esxVI_Boolean {
esxVI_Boolean_False, esxVI_Boolean_False,
}; };
int esxVI_Boolean_Serialize(virConnectPtr conn, esxVI_Boolean boolean, int esxVI_Boolean_Serialize(virConnectPtr conn, esxVI_Boolean boolean_,
const char *element, virBufferPtr output, const char *element, virBufferPtr output,
esxVI_Boolean required); esxVI_Boolean required);
int esxVI_Boolean_Deserialize(virConnectPtr conn, xmlNodePtr node, int esxVI_Boolean_Deserialize(virConnectPtr conn, xmlNodePtr node,
esxVI_Boolean *boolean); esxVI_Boolean *boolean_);

14
src/util/json.c
View File

@ -201,7 +201,7 @@ virJSONValuePtr virJSONValueNewNumberDouble(double data)
} }
virJSONValuePtr virJSONValueNewBoolean(int boolean) virJSONValuePtr virJSONValueNewBoolean(int boolean_)
{ {
virJSONValuePtr val; virJSONValuePtr val;
@ -209,7 +209,7 @@ virJSONValuePtr virJSONValueNewBoolean(int boolean)
return NULL; return NULL;
val->type = VIR_JSON_TYPE_BOOLEAN; val->type = VIR_JSON_TYPE_BOOLEAN;
val->data.boolean = boolean; val->data.boolean = boolean_;
return val; return val;
} }
@ -350,9 +350,9 @@ int virJSONValueObjectAppendNumberDouble(virJSONValuePtr object, const char *key
return 0; return 0;
} }
int virJSONValueObjectAppendBoolean(virJSONValuePtr object, const char *key, int boolean) int virJSONValueObjectAppendBoolean(virJSONValuePtr object, const char *key, int boolean_)
{ {
virJSONValuePtr jvalue = virJSONValueNewBoolean(boolean); virJSONValuePtr jvalue = virJSONValueNewBoolean(boolean_);
if (!jvalue) if (!jvalue)
return -1; return -1;
if (virJSONValueObjectAppend(object, key, jvalue) < 0) { if (virJSONValueObjectAppend(object, key, jvalue) < 0) {
@ -688,12 +688,12 @@ static int virJSONParserHandleNull(void * ctx)
return 1; return 1;
} }
static int virJSONParserHandleBoolean(void * ctx, int boolean) static int virJSONParserHandleBoolean(void * ctx, int boolean_)
{ {
virJSONParserPtr parser = ctx; virJSONParserPtr parser = ctx;
virJSONValuePtr value = virJSONValueNewBoolean(boolean); virJSONValuePtr value = virJSONValueNewBoolean(boolean_);
VIR_DEBUG("parser=%p boolean=%d", parser, boolean); VIR_DEBUG("parser=%p boolean=%d", parser, boolean_);
if (!value) if (!value)
return 0; return 0;