[xine-cvs] CVS: xine-ui/src/xitk file_browser.c,1.59,1.60

[Mathieu O. <mol...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2720/src/xitk

Modified Files:
	file_browser.c 
Log Message:
Renamed the local version of "strverscmp" to "my_strverscmp", to avoid the conflict with the original function (it fixes the compilation with GCC 4.0)

Index: file_browser.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/file_browser.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- file_browser.c	29 May 2005 10:43:40 -0000	1.59
+++ file_browser.c	24 Jan 2006 21:45:55 -0000	1.60
@@ -513,7 +513,7 @@
 #define CMP          2
 #define LEN          3
 #define ISDIGIT(c)   ((unsigned) (c) - '0' <= 9)
-static int strverscmp(const char *s1, const char *s2) {
+static int my_strverscmp(const char *s1, const char *s2) {
   const unsigned char *p1 = (const unsigned char *) s1;
   const unsigned char *p2 = (const unsigned char *) s2;
   unsigned char c1, c2;
@@ -570,13 +570,13 @@
 }
 
 /*
- * Wrapper to strverscmp() for qsort() calls, which sort mrl_t type array.
+ * Wrapper to my_strverscmp() for qsort() calls, which sort mrl_t type array.
  */
 static int _sortfiles_default(const fileinfo_t *s1, const fileinfo_t *s2) {
-  return(strverscmp(s1->name, s2->name));
+  return(my_strverscmp(s1->name, s2->name));
 }
 static int _sortfiles_reverse(const fileinfo_t *s1, const fileinfo_t *s2) {
-  return(strverscmp(s2->name, s1->name));
+  return(my_strverscmp(s2->name, s1->name));
 }
 
 static void sort_files(filebrowser_t *fb) {