From 0f3efd732c8cf5f90da014aa910afff719c56b88 Mon Sep 17 00:00:00 2001
From: Sebastien Helleu <flashcode@flashtux.org>
Date: Fri, 7 Feb 2014 14:15:04 +0100
Subject: Fix compilation errors/warnings

Just for fun :)
---
 src/command.c                |  6 ++++++
 src/gui/curses/gui-display.c | 15 ++++++---------
 src/irc/irc-server.c         |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/command.c b/src/command.c
index ddd3ce202..19a075411 100644
--- a/src/command.c
+++ b/src/command.c
@@ -467,6 +467,9 @@ user_command (t_irc_server *server, char *command)
 int
 weechat_cmd_alias (int argc, char **argv)
 {
+    /* make C compiler happy */
+    (void) argv;
+
     if (argc == 0)
     {
         /* List all aliases */
@@ -657,6 +660,9 @@ weechat_cmd_set (int argc, char **argv)
 int
 weechat_cmd_unalias (int argc, char **argv)
 {
+    /* make C compiler happy */
+    (void) argv;
+
     if (argc != 1)
     {
         gui_printf
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index 9ad67edac..523babc3a 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -45,7 +45,7 @@ t_gui_window *last_gui_window = NULL;       /* pointer to last window       */
 t_gui_window *gui_current_window = NULL;    /* pointer to current window    */
 
 t_gui_color gui_colors[] =
-{ { "default", -1 | A_NORMAL },
+{ { "default", -1 },
   { "black", COLOR_BLACK | A_NORMAL },
   { "red", COLOR_RED | A_NORMAL },
   { "lightred", COLOR_RED | A_BOLD },
@@ -146,7 +146,7 @@ gui_get_color_by_value (int color_value)
 void
 gui_window_set_color (WINDOW *window, int num_color)
 {
-    if (has_colors)
+    if (has_colors ())
     {
         if (color_attr[num_color - 1] & A_BOLD)
             wattron (window, COLOR_PAIR (num_color) | A_BOLD);
@@ -1233,13 +1233,13 @@ gui_window_new (void *server, void *channel
     if ((new_window = (t_gui_window *)(malloc (sizeof (t_gui_window)))))
     {
         /* assign server and channel to window */
-        SERVER(new_window) = server;
-        CHANNEL(new_window) = channel;
+        new_window->server = server;
+        new_window->channel = channel;
         /* assign window to server and channel */
         if (server && !channel)
-            SERVER(new_window)->window = new_window;
+            ((t_irc_server *)new_window->server)->window = new_window;
         if (channel)
-            CHANNEL(new_window)->window = new_window;
+            ((t_irc_channel *)new_window->channel)->window = new_window;
         
         gui_calculate_pos_size (new_window);
         
@@ -1349,13 +1349,10 @@ void
 gui_resize_term_handler ()
 {
     t_gui_window *ptr_win;
-    int width, height;
     
     endwin ();
     refresh ();
     
-    getmaxyx (stdscr, height, width);
-    
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
         gui_calculate_pos_size (ptr_win);
diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c
index b8bacc303..888b0c3d7 100644
--- a/src/irc/irc-server.c
+++ b/src/irc/irc-server.c
@@ -111,7 +111,7 @@ server_create_window (t_irc_server *server)
     if (!SERVER(gui_windows))
     {
         server->window = gui_windows;
-        SERVER(gui_windows) = server;
+        gui_windows->server = server;
     }
     else
         gui_window_new (server, NULL);
-- 
cgit v1.2.3-59-g8ed1b