fix differ in signedness warnings seen under gcc-4.1

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@699 7f574dfc-610e-0410-a909-a81674777703

diff --git a/src/conky.c b/src/conky.c
index d1adecc..59ba006 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -474,9 +474,9 @@ static inline int calc_text_width(const char *s, int l)
        if (use_xft) {
                XGlyphInfo gi;
                if (utf8_mode) {
-                       XftTextExtentsUtf8(display, fonts[selected_font].xftfont, s, l, &gi);
+                       XftTextExtentsUtf8(display, fonts[selected_font].xftfont, (FcChar8 *)s, l, &gi);
                } else {
-                       XftTextExtents8(display, fonts[selected_font].xftfont, s, l, &gi);
+                       XftTextExtents8(display, fonts[selected_font].xftfont, (FcChar8 *)s, l, &gi);
                }
                return gi.xOff;
        } else

diff --git a/src/remoted.c b/src/remoted.c
index 8ddb325..9e094e1 100644 (file)
--- a/src/remoted.c
+++ b/src/remoted.c
@@ -48,7 +48,7 @@ void *daemon_loop()
        int sockfd, new_fd;  // listen on sock_fd, new connection on new_fd
        struct sockaddr_in my_addr;    // my address information
        struct sockaddr_in their_addr; // connector's address information
-       int sin_size;
+       socklen_t  sin_size;
        struct sigaction sa;
        int yes=1;