xnu-792.13.8.tar.gz

[apple/xnu.git] / libkern / c++ / OSUnserializeXML.cpp

diff --git a/libkern/c++/OSUnserializeXML.cpp b/libkern/c++/OSUnserializeXML.cpp
index 975af18f6c45a1d4bd3d6d72b11282ddbb1cfe66..136ffcb1a9b6b296602c1133d535d0c58d35cbb0 100644 (file)
--- a/libkern/c++/OSUnserializeXML.cpp
+++ b/libkern/c++/OSUnserializeXML.cpp
@@ -89,7 +89,7 @@
 
 #define YYSTYPE object_t *
 #define YYPARSE_PARAM  state
-#define YYLEX_PARAM    state
+#define YYLEX_PARAM    (parser_state_t *)state
 
 // this is the internal struct used to hold objects on parser stack
 // it represents objects both before and after they have been created
@@ -155,7 +155,7 @@ extern unsigned long        strtoul(const char *, char **, int);
 
 #define malloc(s) kern_os_malloc(s)
 #define realloc(a, s) kern_os_realloc(a, s)
-#define free(a) kern_os_free(a)
+#define free(a) kern_os_free((void *)a)
 
 #ifndef YYSTYPE
 #define YYSTYPE int
@@ -941,7 +941,7 @@ case 16:
 case 17:
 #line 192 "OSUnserializeXML.y"
 { yyval = yyvsp[-1];
-                                 yyval->key = yyval->object;
+                                 yyval->key = (OSString *)yyval->object;
                                  yyval->object = yyvsp[0]->object;
                                  yyval->next = NULL; 
                                  yyvsp[0]->object = 0;