merge of '818bb018e14c264769009b029c1e28eeb2f0ee4d'

Fri, 09 Nov 2007 01:41:27 +0000

author
Daniel Atallah <datallah@pidgin.im>
date
Fri, 09 Nov 2007 01:41:27 +0000
changeset 21445
05d8c8d51d50
parent 21444
818bb018e14c (current diff)
parent 21439
e450e8cc69b6 (diff)
child 21446
20d581886d71
child 21447
0d64764735e1

merge of '818bb018e14c264769009b029c1e28eeb2f0ee4d'
and 'e450e8cc69b6418c6a3ce7348916004c14f36fa2'

--- a/config.h.mingw	Thu Nov 08 23:47:28 2007 +0000
+++ b/config.h.mingw	Fri Nov 09 01:41:27 2007 +0000
@@ -410,3 +410,6 @@
  */
 #define HAVE_VSNPRINTF 1
 
+#define HAVE_FILENO 1
+
+
--- a/libpurple/win32/libc_interface.h	Thu Nov 08 23:47:28 2007 +0000
+++ b/libpurple/win32/libc_interface.h	Fri Nov 09 01:41:27 2007 +0000
@@ -121,6 +121,8 @@
 #define gethostname( name, size ) \
 wpurple_gethostname( name, size )
 
+#define fsync(fd) _commit(fd)
+
 /* sys/time.h */
 #define gettimeofday( timeval, timezone ) \
 wpurple_gettimeofday( timeval, timezone )

mercurial