[Gaim-commits] CVS: gaim/src gaimrc.c,1.154,1.155 prefs.c,1.363,1.364 util.c,1.175,1.176

[Herman B. <her...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27909

Modified Files:
	gaimrc.c prefs.c util.c 
Log Message:
Fixed warnings (win32)

Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- gaimrc.c	8 Apr 2003 03:52:29 -0000	1.154
+++ gaimrc.c	8 Apr 2003 18:36:48 -0000	1.155
@@ -1114,7 +1114,9 @@
 static void gaimrc_write_sounds(FILE *f)
 {
 	int i;
+#ifndef _WIN32
 	char *cmd;
+#endif
 	fprintf(f, "sound_files {\n");
 	for (i = 0; i < GAIM_NUM_SOUNDS; i++) {
 		char *file = gaim_sound_get_event_file(i);

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -d -r1.363 -r1.364
--- prefs.c	5 Apr 2003 05:01:40 -0000	1.363
+++ prefs.c	8 Apr 2003 18:36:49 -0000	1.364
@@ -67,7 +67,9 @@
 static GtkWidget *show_color_pref(GtkWidget *, gboolean);
 static void delete_prefs(GtkWidget *, void *);
 void set_default_away(GtkWidget *, gpointer);
+#ifndef _WIN32
 static gboolean program_is_valid(const char *);
+#endif
 
 struct debug_window *dw = NULL;
 GtkWidget *prefs = NULL;
@@ -258,7 +260,9 @@
 }
 
 void theme_install_theme(char *path, char *extn) {
+#ifndef _WIN32
 	gchar *command;
+#endif
 	gchar *destdir;
 	gchar *tail;
 
@@ -2211,6 +2215,7 @@
 		default_away = g_slist_nth_data(away_messages, (int)i);
 }
 
+#ifndef _WIN32
 static gboolean program_is_valid(const char *program) 
 {
 	GError *error = NULL;
@@ -2240,6 +2245,7 @@
 	
 	return is_valid;
 }
+#endif
 
 static void update_spin_value(GtkWidget *w, GtkWidget *spin)
 {

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- util.c	8 Apr 2003 02:59:58 -0000	1.175
+++ util.c	8 Apr 2003 18:36:50 -0000	1.176
@@ -47,10 +47,10 @@
 #include "prpl.h"
 #include "gtklist.h"
 
+#ifndef _WIN32
 #include <sys/socket.h>
 #include <arpa/inet.h>
-
-#ifdef _WIN32
+#else
 #include "win32dep.h"
 #endif