From 232e5a27f06b373f887bb7df0a8829894d6a738a Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sun, 8 Oct 2006 10:20:05 +0000 Subject: [PATCH] Fixed compilation warnings for AMD64 --- src/common/backtrace.c | 2 +- src/common/session.c | 2 +- src/gui/curses/gui-curses-window.c | 4 ++-- src/irc/irc-server.c | 2 +- weechat/src/common/backtrace.c | 2 +- weechat/src/common/session.c | 2 +- weechat/src/gui/curses/gui-curses-window.c | 4 ++-- weechat/src/irc/irc-server.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index fb6ff71a1..7bfadc287 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -88,7 +88,7 @@ weechat_backtrace_addr2line (int number, void *address, char *symbol) addr = address; if (info.dli_fbase >= (const void *) 0x40000000) - addr = (const char *) addr - (unsigned int) info.dli_fbase; + addr = (void *)((unsigned long)((const char *) addr) - (unsigned long) info.dli_fbase); snprintf (cmd_line, sizeof (cmd_line), "addr2line --functions --demangle -e $(which %s) %p", diff --git a/src/common/session.c b/src/common/session.c index 0b93f1278..e885326a3 100644 --- a/src/common/session.c +++ b/src/common/session.c @@ -952,7 +952,7 @@ session_load_server (FILE *file) gnutls_session_set_data (session_current_server->gnutls_sess, session_data, session_size); free (session_data); gnutls_transport_set_ptr (session_current_server->gnutls_sess, - (gnutls_transport_ptr) session_current_server->sock); + (gnutls_transport_ptr) ((unsigned long) session_current_server->sock)); if (gnutls_handshake (session_current_server->gnutls_sess) < 0) { session_crash (file, _("gnutls handshake failed")); diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c index e5d3c003a..275db8086 100644 --- a/src/gui/curses/gui-curses-window.c +++ b/src/gui/curses/gui-curses-window.c @@ -1227,8 +1227,8 @@ gui_window_set_title () if (strcmp( envterm, "sun-cmd") == 0) printf ("\033]l%s %s\033\\", PACKAGE_NAME, PACKAGE_VERSION); else if (strcmp(envterm, "hpterm") == 0) - printf ("\033&f0k%dD%s %s", strlen(PACKAGE_NAME) + - strlen(PACKAGE_VERSION) + 1, + printf ("\033&f0k%dD%s %s", + (int)(strlen(PACKAGE_NAME) + strlen(PACKAGE_VERSION) + 1), PACKAGE_NAME, PACKAGE_VERSION); /* the following term supports the xterm excapes */ else if (strncmp (envterm, "xterm", 5) == 0 diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c index 3e2110ac8..10d77c31a 100644 --- a/src/irc/irc-server.c +++ b/src/irc/irc-server.c @@ -974,7 +974,7 @@ server_child_read (t_irc_server *server) if (server->ssl_connected) { gnutls_transport_set_ptr (server->gnutls_sess, - (gnutls_transport_ptr) server->sock); + (gnutls_transport_ptr) ((unsigned long) server->sock)); if (gnutls_handshake (server->gnutls_sess) < 0) { irc_display_prefix (server, server->buffer, PREFIX_ERROR); diff --git a/weechat/src/common/backtrace.c b/weechat/src/common/backtrace.c index fb6ff71a1..7bfadc287 100644 --- a/weechat/src/common/backtrace.c +++ b/weechat/src/common/backtrace.c @@ -88,7 +88,7 @@ weechat_backtrace_addr2line (int number, void *address, char *symbol) addr = address; if (info.dli_fbase >= (const void *) 0x40000000) - addr = (const char *) addr - (unsigned int) info.dli_fbase; + addr = (void *)((unsigned long)((const char *) addr) - (unsigned long) info.dli_fbase); snprintf (cmd_line, sizeof (cmd_line), "addr2line --functions --demangle -e $(which %s) %p", diff --git a/weechat/src/common/session.c b/weechat/src/common/session.c index 0b93f1278..e885326a3 100644 --- a/weechat/src/common/session.c +++ b/weechat/src/common/session.c @@ -952,7 +952,7 @@ session_load_server (FILE *file) gnutls_session_set_data (session_current_server->gnutls_sess, session_data, session_size); free (session_data); gnutls_transport_set_ptr (session_current_server->gnutls_sess, - (gnutls_transport_ptr) session_current_server->sock); + (gnutls_transport_ptr) ((unsigned long) session_current_server->sock)); if (gnutls_handshake (session_current_server->gnutls_sess) < 0) { session_crash (file, _("gnutls handshake failed")); diff --git a/weechat/src/gui/curses/gui-curses-window.c b/weechat/src/gui/curses/gui-curses-window.c index e5d3c003a..275db8086 100644 --- a/weechat/src/gui/curses/gui-curses-window.c +++ b/weechat/src/gui/curses/gui-curses-window.c @@ -1227,8 +1227,8 @@ gui_window_set_title () if (strcmp( envterm, "sun-cmd") == 0) printf ("\033]l%s %s\033\\", PACKAGE_NAME, PACKAGE_VERSION); else if (strcmp(envterm, "hpterm") == 0) - printf ("\033&f0k%dD%s %s", strlen(PACKAGE_NAME) + - strlen(PACKAGE_VERSION) + 1, + printf ("\033&f0k%dD%s %s", + (int)(strlen(PACKAGE_NAME) + strlen(PACKAGE_VERSION) + 1), PACKAGE_NAME, PACKAGE_VERSION); /* the following term supports the xterm excapes */ else if (strncmp (envterm, "xterm", 5) == 0 diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c index 3e2110ac8..10d77c31a 100644 --- a/weechat/src/irc/irc-server.c +++ b/weechat/src/irc/irc-server.c @@ -974,7 +974,7 @@ server_child_read (t_irc_server *server) if (server->ssl_connected) { gnutls_transport_set_ptr (server->gnutls_sess, - (gnutls_transport_ptr) server->sock); + (gnutls_transport_ptr) ((unsigned long) server->sock)); if (gnutls_handshake (server->gnutls_sess) < 0) { irc_display_prefix (server, server->buffer, PREFIX_ERROR);