camel-private.h Drop the Win32 fsync() implementation. Instead just use

2008-06-06  Tor Lillqvist  <tml@novell.com>

	* camel-private.h
	* camel-win32.c: Drop the Win32 fsync() implementation. Instead
	just use _commit() in the Microsoft C library which does the same.

	* Makefile.am: Link libcamel with ICONV_LIBS.

svn path=/trunk/; revision=8945

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 880df6e..c8b837a 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-06  Tor Lillqvist  <tml@novell.com>
+
+       * camel-private.h
+       * camel-win32.c: Drop the Win32 fsync() implementation. Instead
+       just use _commit() in the Microsoft C library which does the same.
+
+       * Makefile.am: Link libcamel with ICONV_LIBS.
+
 2008-05-29  Milan Crha  <mcrha@redhat.com>
 
        ** Part of fix for bug #534312

diff --git a/camel/camel-private.h b/camel/camel-private.h
index 641039b..69b59b8 100644 (file)
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -190,7 +190,7 @@ struct _CamelCertDBPrivate {
        (g_mutex_unlock (((CamelCertDB *) (db))->priv->l))
 
 #ifdef G_OS_WIN32
-int fsync (int fd);
+#define fsync(fd) _commit(fd)
 
 const char *_camel_get_localedir (void) G_GNUC_CONST;
 const char *_camel_get_libexecdir (void) G_GNUC_CONST;

diff --git a/camel/camel-win32.c b/camel/camel-win32.c
index f4c7ae5..818beef 100644 (file)
--- a/camel/camel-win32.c
+++ b/camel/camel-win32.c
@@ -76,31 +76,3 @@ _camel_get_##varbl (void)                    \
 GETTER(localedir)
 GETTER(libexecdir)
 GETTER(providerdir)
-
-int
-fsync (int fd)
-{
-       int handle;
-       struct stat st;
-
-       handle = _get_osfhandle (fd);
-       if (handle == -1)
-               return -1;
-
-       fstat (fd, &st);
-
-       /* FlushFileBuffers() fails if called on a handle to the
-        * console output. As we cannot know whether fd refers to the
-        * console output or not, punt, and call FlushFileBuffers()
-        * only for regular files and pipes.
-        */
-       if (!(S_ISREG (st.st_mode) || S_ISFIFO (st.st_mode)))
-               return 0;
-
-       if (FlushFileBuffers ((HANDLE) handle))
-               return 0;
-
-       errno = EIO;
-       return -1;
-}
-