[Ayttm-commits] CVS: ayttm/modules/icq/libicq libicq.c,1.1.1.1,1.2 receive.c,1.1.1.1,1.2 tcp.c,1.1.1.1,1.2 util.c,1.1.1.1,1.2

[Andy Maloney <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/icq/libicq
In directory subversions:/tmp/cvs-serv6797/modules/icq/libicq

Modified Files:
        libicq.c receive.c tcp.c util.c 
Log Message:
Fixes for -Wall

Index: libicq.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/libicq.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- libicq.c    23 Dec 2002 22:04:40 -0000      1.1.1.1
+++ libicq.c    11 Jan 2003 14:52:16 -0000      1.2
@@ -14,10 +14,20 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+/* FIXME - because there is a local file named config.h, we include
+       the relative path to get the one we want
+*/
+#include "../../../config.h"
+#endif
 
 #include <errno.h> 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <time.h>
+#include <glib.h>
 
 #if defined( _WIN32 ) && !defined(__MINGW32__)
 #include <windows.h>
@@ -35,11 +45,6 @@
 #include <sys/time.h>
 #define ERRNO  errno
 #endif /* _WIN32 */
-
-#include <sys/types.h>
-#include <time.h>
-
-#include <glib.h>
 
 #include "icq.h"
 #include "libicq.h"

Index: receive.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/receive.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- receive.c   23 Dec 2002 22:04:41 -0000      1.1.1.1
+++ receive.c   11 Jan 2003 14:52:16 -0000      1.2
@@ -14,28 +14,33 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+/* FIXME - because there is a local file named config.h, we include
+       the relative path to get the one we want
+*/
+#include "../../../config.h"
+#endif
 
 #include <stdio.h>
 #include <string.h>
-
+#include <time.h>
 #include <glib.h>
+
 #if defined( _WIN32 ) && !defined(__MINGW32__)
 #include <windows.h>
 #include <io.h>
-#include <time.h>
 #else /* !_WIN32 */
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
 #include <sys/types.h>
 #ifndef __MINGW32__
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#endif
 
 #include "icq.h"
 #include "libicq.h"
@@ -43,6 +48,7 @@
 #include "send.h"
 #include "util.h"
 #include "tcp.h"
+
 
 extern gint Verbose;
 extern gint sok;

Index: tcp.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/tcp.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tcp.c       23 Dec 2002 22:04:40 -0000      1.1.1.1
+++ tcp.c       11 Jan 2003 14:52:16 -0000      1.2
@@ -12,10 +12,21 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+/* FIXME - because there is a local file named config.h, we include
+       the relative path to get the one we want
+*/
+#include "../../../config.h"
+#endif
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <glib.h>
+#include <string.h>
+
 #if defined( _WIN32 ) && !defined(__MINGW32__)
 #include <winsock2.h>
 #include <io.h>
@@ -31,19 +42,13 @@
 #endif
 #endif
 
-#include <sys/types.h>
-
-
-#include <glib.h>
-
-#include <string.h>
-
 #include "icq.h"
 #include "libicq.h"
 #include "receive.h"
 #include "tcp.h"
 #include "libproxy.h"
 #include "plugin_api.h"
+
 
 const guint32 LOCALHOST = 0x0100007F;
 

Index: util.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/icq/libicq/util.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- util.c      23 Dec 2002 22:04:40 -0000      1.1.1.1
+++ util.c      11 Jan 2003 14:52:16 -0000      1.2
@@ -14,26 +14,32 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+/* FIXME - because there is a local file named config.h, we include
+       the relative path to get the one we want
+*/
+#include "../../../config.h"
+#endif
 
 #include <stdio.h>
-#if defined( _WIN32 ) && !defined(__MINGW32__)
 #include <stdlib.h>
+#include <glib.h>
+#include <sys/types.h>
+
+#if defined( _WIN32 ) && !defined(__MINGW32__)
 #include <io.h>
 #else
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <stdlib.h>
 #endif
 
-#include <glib.h>
-
-#include "icq.h"
-#include "libicq.h"
-#include <sys/types.h>
 #ifndef __MINGW32__
 #include <sys/socket.h>
 #endif
+
+#include "icq.h"
+#include "libicq.h"
 
 
 extern Contact_Member Contacts[];