remove c++isms from jsw code

[zpackage] / lib / jsw / jsw_avltree.c

diff --git a/lib/jsw/jsw_avltree.c b/lib/jsw/jsw_avltree.c
index f8910fbbf6831cc9852c3feab61fd9f91d8993fb..eb91eb76cec19bf02c5a2839582524e0eb9d30c4 100644 (file)
--- a/lib/jsw/jsw_avltree.c
+++ b/lib/jsw/jsw_avltree.c
@@ -6,15 +6,7 @@
 */
 #include "jsw_avltree.h"
 
-#ifdef __cplusplus
-#include <cstdlib>
-
-using std::malloc;
-using std::free;
-using std::size_t;
-#else
 #include <stdlib.h>
-#endif
 
 #ifndef HEIGHT_LIMIT
 #define HEIGHT_LIMIT 64 /* Tallest allowable tree */
@@ -114,7 +106,7 @@ struct jsw_avltrav {
 
 static jsw_avlnode_t *new_node ( jsw_avltree_t *tree, void *data )
 {
-  jsw_avlnode_t *rn = (jsw_avlnode_t *)malloc ( sizeof *rn );
+  jsw_avlnode_t *rn = malloc ( sizeof *rn );
 
   if ( rn == NULL )
     return NULL;
@@ -128,7 +120,7 @@ static jsw_avlnode_t *new_node ( jsw_avltree_t *tree, void *data )
 
 jsw_avltree_t *jsw_avlnew ( cmp_f cmp, dup_f dup, rel_f rel )
 {
-  jsw_avltree_t *rt = (jsw_avltree_t *)malloc ( sizeof *rt );
+  jsw_avltree_t *rt = malloc ( sizeof *rt );
 
   if ( rt == NULL )
     return NULL;