some conflicts resolved

[wxWidgets.git] / src / xpm / misc.c

diff --git a/src/xpm/misc.c b/src/xpm/misc.c
index c0089ab011673ff284fffc25031ded62d5e1cc12..3ef812a1cedbeb68a987cae8c082082bd271d606 100644 (file)
--- a/src/xpm/misc.c
+++ b/src/xpm/misc.c
@@ -131,7 +131,7 @@ XpmFreeExtensions(XpmExtension *extensions, int nextensions)
     char **sptr;
 
     if (extensions) {
-       for (i = 0, ext = extensions; i < nextensions; i++, ext++) {
+       for (i = 0, ext = extensions; i < (unsigned int)nextensions; i++, ext++) {
            if (ext->name)
                XpmFree(ext->name);
            nlines = ext->nlines;