More warning fixes (64 bit).

3 files changed, 13 insertions, 7 deletions

diff --git a/src/lib/rend.c b/src/lib/rend.c
index bb4e865..e2759cd 100644
--- a/src/lib/rend.c
+++ b/src/lib/rend.c
@@ -268,7 +268,10 @@ __imlib_RenderImage(Display * d, ImlibImage * im,
    ImlibRGBAFunction   rgbaer;
    ImlibMaskFunction   masker = NULL;
    ImlibBlendFunction  blender = NULL;
+
+#ifdef DO_MMX_ASM
    int                 do_mmx;
+#endif
 
    blender = __imlib_GetBlendFunction(op, 1, 0,
                                       (!(im->flags & F_HAS_ALPHA)), NULL);
diff --git a/src/lib/rotate.c b/src/lib/rotate.c
index 53d1087..9c9353e 100644
--- a/src/lib/rotate.c
+++ b/src/lib/rotate.c
@@ -342,7 +342,10 @@ __imlib_BlendImageToImageSkewed(ImlibImage * im_src, ImlibImage * im_dst,
    int                 x, y, dxh, dyh, dxv, dyv, i;
    double              xy2;
    DATA32             *data, *src;
+
+#ifdef DO_MMX_ASM
    int                 do_mmx;
+#endif
 
    if ((ssw < 0) || (ssh < 0))
       return;
diff --git a/src/modules/loaders/loader_id3.c b/src/modules/loaders/loader_id3.c
index 2c241d0..0b4f215 100644
--- a/src/modules/loaders/loader_id3.c
+++ b/src/modules/loaders/loader_id3.c
@@ -37,7 +37,7 @@ id3_tag_get_frame(struct id3_tag *tag, size_t index)
    return tag->frames[index];
 }
 
-static inline       size_t
+static inline unsigned int
 id3_tag_get_numframes(struct id3_tag *tag)
 {
    return tag->nframes;
@@ -200,7 +200,7 @@ context_delref(context * ctx)
 }
 
 static int
-str2int(char *str, int old)
+str2int(const char *str, int old)
 {
    long                index;
 
@@ -209,14 +209,14 @@ str2int(char *str, int old)
    return ((errno || index > INT_MAX) ? old : (int)index);
 }
 
-static              size_t
-str2uint(char *str, size_t old)
+static unsigned int
+str2uint(const char *str, unsigned int old)
 {
    unsigned long       index;
 
    errno = 0;
    index = strtoul(str, NULL, 10);
-   return ((errno || index > UINT_MAX) ? old : (size_t) index);
+   return ((errno || index > UINT_MAX) ? old : index);
 }
 
 static void
@@ -233,7 +233,7 @@ destructor_context(ImlibImage * im, void *data)
 
 typedef struct lopt {
    context            *ctx;
-   size_t              index;
+   unsigned int        index;
    int                 traverse;
    char                cache_level;
 } lopt;
@@ -241,7 +241,7 @@ typedef struct lopt {
 static char
 get_options(lopt * opt, ImlibImage * im)
 {
-   size_t              handle = 0, index = 0, traverse = 0;
+   unsigned int        handle = 0, index = 0, traverse = 0;
    context            *ctx;
 
    if (im->key)