Restore ORTE specific modifications to uLUt.

ORTE defines FREE macro to cover different systems
implementations and uses "orte_all.h" to cover different
set and names of system provided header files.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/orte/liborte/ul_gavl.c b/orte/liborte/ul_gavl.c
index 94cb319d5e322e5970966f7860d78612036b1bc6..ef2b57f71e68697f459ec25f2d39d1438c67941c 100644 (file)
--- a/orte/liborte/ul_gavl.c
+++ b/orte/liborte/ul_gavl.c
@@ -21,8 +21,10 @@
 
  *******************************************************************/
 
-#include <string.h>
-#include "ul_utmalloc.h"
+#include <orte_all.h>
+//#include <string.h>
+//#include "ul_utmalloc.h"
+
 #include "ul_gavl.h"
 
 int 
@@ -319,7 +321,7 @@ gavl_delete(gavl_root_t *root, void *item)
   /* delete_primitive called directly for speedup */
   ret=gavl_delete_primitive(&root->root_node, n);
   if(root->node_offs<0)
-    free(n);
+    FREE(n);
   return ret;
 }
 
@@ -590,7 +592,7 @@ gavl_cut_first(gavl_root_t *root)
     return NULL;
   item=gavl_node2item(root,n);
   if(root->node_offs<0)
-    free(n);
+    FREE(n);
   return item;
 }
 

diff --git a/orte/liborte/ul_gavlprim.c b/orte/liborte/ul_gavlprim.c
index 491ecd7b9f37fcb46e602246b0c162475487f21b..4696e10a5542875fc99f27058123c75441c08448 100644 (file)
--- a/orte/liborte/ul_gavlprim.c
+++ b/orte/liborte/ul_gavlprim.c
@@ -21,7 +21,8 @@
 
  *******************************************************************/
 
-#include <string.h>
+//#include <string.h>
+#include <orte_all.h>
 #include "ul_gavl.h"
 
 int