[Kstars-devel] branches/KDE/3.5/kdeedu/kstars/kstars/indi

[Jason Harris]

SVN commit 517084 by harris:

Backport: Renaming xmlMalloc to indi_xmlMalloc to avoid conflict with 
libxml2. 

CCMAIL: kstars-devel at kde.org
CCMAIL: neoclust.kde at gmail.com



 M  +1 -1      indiserver.c  
 M  +2 -2      lilxml.c  
 M  +1 -1      lilxml.h  


--- branches/KDE/3.5/kdeedu/kstars/kstars/indi/indiserver.c #517083:517084
@@ -172,7 +172,7 @@
 	pthread_mutex_init(&malloc_m, NULL);
 
 	/* install our locked heap functions */
-	xmlMalloc (mymalloc, myrealloc, myfree);
+	indi_xmlMalloc (mymalloc, myrealloc, myfree);
 	setMemFuncsFQ (mymalloc, myrealloc, myfree);
 
 	/* seed client info array so we can always use realloc */
--- branches/KDE/3.5/kdeedu/kstars/kstars/indi/lilxml.c #517083:517084
@@ -96,7 +96,7 @@
     struct _xml_ele *ce;	/* containing element */
 };
 
-/* default memory managers, override with xmlMalloc() */
+/* default memory managers, override with indi_xmlMalloc() */
 static void *(*mymalloc)(size_t size) = malloc;
 static void *(*myrealloc)(void *ptr, size_t size) = realloc;
 static void (*myfree)(void *ptr) = free;
@@ -105,7 +105,7 @@
  * N.B. don't call after first use of any other lilxml function
  */
 void
-xmlMalloc (void *(*newmalloc)(size_t size),
+indi_xmlMalloc (void *(*newmalloc)(size_t size),
 	   void *(*newrealloc)(void *ptr, size_t size),
 	   void (*newfree)(void *ptr))
 {
--- branches/KDE/3.5/kdeedu/kstars/kstars/indi/lilxml.h #517083:517084
@@ -207,7 +207,7 @@
 extern void prXMLEle (FILE *fp, XMLEle *e, int level);
 
 /* install alternatives to malloc/realloc/free */
-extern void xmlMalloc (void *(*newmalloc)(size_t size),
+extern void indi_xmlMalloc (void *(*newmalloc)(size_t size),
     void *(*newrealloc)(void *ptr, size_t size), void (*newfree)(void *ptr));
 
 /*@}*/