[Ayttm-commits] CVS: ayttm/src account.c,1.16,1.17 message_parse.c,1.18,1.19 offline_queue_mgmt.c,1.8,1.9 util.c,1.58,1.59

[Edward L. Haletky <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv22619/src

Modified Files:
        account.c message_parse.c offline_queue_mgmt.c util.c 
Log Message:


Added more #ifdef __MINGW32__ to cover the missing snprintf and moved
around so older #ifndef __MINGW32__ to get rid of warnings about unused
variables.


Index: account.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/account.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- account.c   29 Jan 2003 19:19:22 -0000      1.16
+++ account.c   23 Mar 2003 23:48:15 -0000      1.17
@@ -31,6 +31,9 @@
 #include "value_pair.h"
 #include "util.h"
 #include "add_contact_window.h"
+#ifdef __MINGW32__
+#define snprintf g_snprintf
+#endif
 
 
 void write_account_list()

Index: message_parse.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/message_parse.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- message_parse.c     22 Mar 2003 11:48:25 -0000      1.18
+++ message_parse.c     23 Mar 2003 23:48:15 -0000      1.19
@@ -56,6 +56,9 @@
 #include "progress_window.h"
 #include "service.h"
 #include "plugin_api.h"
+#ifdef __MINGW32__
+#define snprintf g_snprintf
+#endif
 
 
 char filename[1024];
@@ -83,12 +86,12 @@
 
 static void send_file2(void * ptr )
 {
+#ifndef __MINGW32__
        send_file_struct * sfs = ptr;
        unsigned long i = 0;
        char buff[1025];
 
 
-#ifndef __MINGW32__
        pthread_mutex_lock(&mutex);
        xfer_in_progress = 1;
        pthread_mutex_unlock(&mutex);

Index: offline_queue_mgmt.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/offline_queue_mgmt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- offline_queue_mgmt.c        17 Mar 2003 18:17:08 -0000      1.8
+++ offline_queue_mgmt.c        23 Mar 2003 23:48:15 -0000      1.9
@@ -31,6 +31,9 @@
 #include "mem_util.h"
 #include "offline_queue_mgmt.h"  /* so the compiler tells us about type 
mismatches */
 #include "util.h"
+#ifdef __MINGW32__
+#define snprintf g_snprintf
+#endif
 
 
 /* FIXME: temporary */

Index: util.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/util.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- util.c      23 Mar 2003 13:22:59 -0000      1.58
+++ util.c      23 Mar 2003 23:48:15 -0000      1.59
@@ -56,6 +56,9 @@
 #include "dialog.h"
 #include "service.h"
 #include "offline_queue_mgmt.h"
+#ifdef __MINGW32__
+#define snprintf g_snprintf
+#endif
 
 
 #ifndef NAME_MAX
@@ -64,15 +67,15 @@
 
 int clean_pid(void * dummy)
 {
+#ifndef __MINGW32__
     int status;
     pid_t pid;
 
-#ifndef __MINGW32__
     pid = waitpid(-1, &status, WNOHANG);
-#endif
 
     if (pid == 0)
         return TRUE;
+#endif
 
     return FALSE;
 }
@@ -1388,10 +1391,10 @@
 pid_t create_lock_file(char* fname)
 {
        pid_t ourpid = -1;
+#ifndef __MINGW32__
        struct stat sbuff;
        FILE* f;
 
-#ifndef __MINGW32__
        if (stat(fname, &sbuff) != 0) { 
                /* file doesn't exist, so we're gonna open it to write out pid 
to it */
                ourpid = getpid();