Commit e7f72353 authored by Berke Viktor's avatar Berke Viktor

Some aid for compiler warnings

parent 4cae471a
......@@ -30,7 +30,9 @@
#include "text.h"
#include "xchatc.h"
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#define HEXCHAT_DIR "hexchat"
#endif
......
......@@ -8,7 +8,9 @@
#include <fcntl.h>
#include <errno.h>
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
......
......@@ -40,6 +40,7 @@
#ifdef WIN32
#include <windows.h>
#include <io.h>
#else
#include <unistd.h>
#endif
......@@ -803,7 +804,6 @@ static gboolean
dcc_did_connect (GIOChannel *source, GIOCondition condition, struct DCC *dcc)
{
int er;
struct sockaddr_in addr;
#ifdef WIN32
if (condition & G_IO_ERR)
......@@ -822,6 +822,8 @@ dcc_did_connect (GIOChannel *source, GIOCondition condition, struct DCC *dcc)
}
#else
struct sockaddr_in addr;
memset (&addr, 0, sizeof (addr));
addr.sin_port = htons (dcc->port);
addr.sin_family = AF_INET;
......@@ -1980,7 +1982,9 @@ dcc_change_nick (struct server *serv, char *oldnick, char *newnick)
static int
is_same_file (struct DCC *dcc, struct DCC *new_dcc)
{
#ifndef WIN32
struct stat st_a, st_b;
#endif
/* if it's the same filename, must be same */
if (strcmp (dcc->destfile, new_dcc->destfile) == 0)
......
......@@ -3,6 +3,7 @@
#include "inet.h"
#include "xchat.h"
#include "xchatc.h"
#include "text.h"
static int identd_is_running = FALSE;
#ifdef USE_IPV6
......
......@@ -23,7 +23,9 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
......
......@@ -23,7 +23,9 @@
#include <sys/types.h>
#include <time.h>
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
......
......@@ -24,7 +24,9 @@
#include <fcntl.h>
#include <time.h>
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
......
......@@ -54,7 +54,7 @@
#include "server.h"
#include "tree.h"
#include "outbound.h"
#include "chanopt.h"
#ifdef USE_DEBUG
extern int current_mem_usage;
......
......@@ -41,6 +41,7 @@
#include "outbound.h"
#include "util.h"
#include "xchatc.h"
#include "url.h"
static void
......
......@@ -33,12 +33,13 @@
#define WANTARPA
#include "inet.h"
#ifndef WIN32
#ifdef WIN32
#include <winbase.h>
#include <io.h>
#else
#include <signal.h>
#include <sys/wait.h>
#include <unistd.h>
#else
#include <winbase.h>
#endif
#include "xchat.h"
......@@ -907,7 +908,9 @@ server_read_child (GIOChannel *source, GIOCondition condition, server *serv)
char outbuf[512];
char host[100];
char ip[100];
#ifdef USE_MSPROXY
char *p;
#endif
waitline2 (source, tbuf, sizeof tbuf);
......
......@@ -20,12 +20,17 @@
#include "inet.h" /* make it first to avoid macro redefinitions */
#include <openssl/ssl.h> /* SSL_() */
#include <openssl/err.h> /* ERR_() */
#include <time.h> /* asctime() */
#ifdef WIN32
#include <openssl/rand.h> /* RAND_seed() */
#endif
#include <time.h> /* asctime() */
#include <string.h> /* strncpy() */
#include "ssl.h" /* struct cert_info */
#include "ssl.h" /* struct cert_info */
#include "../../config.h" /* HAVE_SNPRINTF */
#ifndef HAVE_SNPRINTF
#include <glib.h>
#include <glib/gprintf.h>
#define snprintf g_snprintf
#endif
......
......@@ -25,7 +25,9 @@
#include <fcntl.h>
#include <sys/stat.h>
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#include <sys/mman.h>
#endif
......
......@@ -1365,10 +1365,12 @@ int my_poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
int
util_exec (const char *cmd)
{
int pid;
char **argv;
int argc;
#ifndef WIN32
int pid;
int fd;
#endif
if (my_poptParseArgvString (cmd, &argc, &argv) != 0)
return -1;
......@@ -1398,9 +1400,9 @@ util_exec (const char *cmd)
int
util_execv (char * const argv[])
{
#ifndef WIN32
int pid, fd;
#ifndef WIN32
pid = fork ();
if (pid == -1)
return -1;
......
......@@ -22,7 +22,9 @@
#include <fcntl.h>
#include <time.h>
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
......@@ -54,6 +56,7 @@
#include "../common/server.h"
#include "gtkutil.h"
#include "maingui.h"
#include "menu.h"
#include "custom-list.h"
......
......@@ -23,7 +23,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
......
......@@ -57,6 +57,7 @@
#include "fkeys.h"
#include "plugin-tray.h"
#include "urlgrab.h"
#include "setup.h"
#ifdef USE_XLIB
#include <gdk/gdkx.h>
......@@ -866,7 +867,7 @@ fe_ctrl_gui (session *sess, fe_gui_action action, int arg)
mg_detach (sess, arg); /* arg: 0=toggle 1=detach 2=attach */
break;
case FE_GUI_APPLY:
setup_apply_real (TRUE, TRUE);
setup_apply_real (TRUE, TRUE, TRUE);
}
}
......
......@@ -120,6 +120,8 @@
<ClInclude Include="plugingui.h" />
<ClInclude Include="rawlog.h" />
<ClInclude Include="search.h" />
<ClInclude Include="servlistgui.h" />
<ClInclude Include="setup.h" />
<ClInclude Include="sexy-iso-codes.h" />
<ClInclude Include="sexy-marshal.h" />
<ClInclude Include="sexy-spell-entry.h" />
......
......@@ -102,6 +102,12 @@
<ClInclude Include="xtext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="servlistgui.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="setup.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="about.c">
......
......@@ -24,12 +24,15 @@
#include <fcntl.h>
#include <ctype.h>
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
#include "fe-gtk.h"
#include <glib.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkeditable.h>
#include <gtk/gtkmenu.h>
......
......@@ -53,6 +53,7 @@
#include "pixmaps.h"
#ifdef WIN32
#include <io.h>
#if 0 /* native file dialogs */
#include "../common/fe.h"
#include "../common/thread.h"
......
......@@ -54,6 +54,7 @@
#include "../common/modes.h"
#include "../common/url.h"
#include "../common/util.h"
#include "../common/text.h"
#include "fe-gtk.h"
#include "banlist.h"
......@@ -2801,7 +2802,10 @@ mg_inputbox_rightclick (GtkEntry *entry, GtkWidget *menu)
static void
mg_create_entry (session *sess, GtkWidget *box)
{
GtkWidget *sw, *hbox, *but, *entry;
GtkWidget *hbox, *but, *entry;
#ifdef USE_GTKSPELL
GtkWidget *sw;
#endif
session_gui *gui = sess->gui;
hbox = gtk_hbox_new (FALSE, 0);
......@@ -3695,7 +3699,9 @@ mg_drag_motion_cb (GtkWidget *widget, GdkDragContext *context, int x, int y, gui
GdkGCValues val;
int half, width, height;
int ox, oy;
#if 0
GtkPaned *paned;
#endif
GdkDrawable *draw;
/* ignore file drops */
......
......@@ -23,6 +23,7 @@
#ifdef WIN32
#include <windows.h>
#include <io.h>
#else
#include <unistd.h>
#endif
......@@ -72,6 +73,7 @@
#include "urlgrab.h"
#include "userlistgui.h"
#include "menu.h"
#include "servlistgui.h"
static GSList *submenu_list;
......
......@@ -45,6 +45,7 @@
#include "../common/server.h"
#include "../common/util.h"
#include "../common/userlist.h"
#include "../common/outbound.h"
#include "gtkutil.h"
#include "maingui.h"
#include "palette.h"
......
......@@ -22,7 +22,9 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
......
......@@ -8,6 +8,7 @@
#include "../common/server.h"
#include "../common/fe.h"
#include "../common/util.h"
#include "../common/outbound.h"
#include "fe-gtk.h"
#include "pixmaps.h"
#include "maingui.h"
......@@ -497,9 +498,11 @@ static void
tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
{
GtkWidget *menu;
#ifndef WIN32
GtkWidget *submenu;
GtkWidget *item;
int away_status;
#endif
/* ph may have an invalid context now */
xchat_set_context (ph, xchat_find_context (ph, NULL, NULL));
......
......@@ -21,7 +21,9 @@
#include <fcntl.h>
#include <stdlib.h>
#ifndef WIN32
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
......
......@@ -37,6 +37,7 @@
#include "../common/servlist.h"
#include "../common/cfgfiles.h"
#include "../common/fe.h"
#include "../common/util.h"
#include "fe-gtk.h"
#include "gtkutil.h"
......
void servlist_autojoinedit (ircnet *net, char *channel, gboolean add);
......@@ -21,6 +21,7 @@
#include "palette.h"
#include "pixmaps.h"
#include "menu.h"
#include "plugin-tray.h"
#include <gtk/gtkcolorseldialog.h>
#include <gtk/gtktable.h>
......
void setup_apply_real (int new_pix, int do_ulist, int do_layout);
\ No newline at end of file
......@@ -35,6 +35,7 @@
#ifdef WIN32
#include "typedef.h"
#include <io.h>
#endif
#include "../common/cfgfiles.h"
......
......@@ -40,6 +40,7 @@
#include "../common/modes.h"
#include "../common/notify.h"
#include "../common/xchatc.h"
#include "../common/fe.h"
#include "gtkutil.h"
#include "palette.h"
#include "maingui.h"
......
......@@ -76,6 +76,8 @@
#ifdef WIN32
#include <windows.h>
#include <io.h>
#include <gdk/gdk.h>
#include <gdk/gdkwin32.h>
#else
#include <unistd.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment