--- xnu/xnu-792.10.96/libkern/c++/OSUnserializeXML.cpp
+++ xnu/xnu-792/libkern/c++/OSUnserializeXML.cpp
@@ -81,7 +81,7 @@
 
 #define YYSTYPE object_t *
 #define YYPARSE_PARAM	state
-#define YYLEX_PARAM	(parser_state_t *)state
+#define YYLEX_PARAM	state
 
 // this is the internal struct used to hold objects on parser stack
 // it represents objects both before and after they have been created
@@ -147,7 +147,7 @@
 
 #define malloc(s) kern_os_malloc(s)
 #define realloc(a, s) kern_os_realloc(a, s)
-#define free(a) kern_os_free((void *)a)
+#define free(a) kern_os_free(a)
 
 #ifndef YYSTYPE
 #define YYSTYPE int
@@ -935,7 +935,7 @@
 case 17:
 #line 192 "OSUnserializeXML.y"
 { yyval = yyvsp[-1];
-				  yyval->key = (OSString *)yyval->object;
+				  yyval->key = yyval->object;
 				  yyval->object = yyvsp[0]->object;
 				  yyval->next = NULL; 
 				  yyvsp[0]->object = 0;