1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-29 21:49:07 +00:00

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
This commit is contained in:
Philip Kovacs 2006-09-01 17:11:14 +00:00
parent 40f78b11c4
commit f3fed13727
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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;