diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.ja | 7 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | src/mbox.c | 4 | ||||
| -rw-r--r-- | src/mh.c | 4 | ||||
| -rw-r--r-- | src/session.c | 2 |
6 files changed, 25 insertions, 0 deletions
@@ -1,5 +1,12 @@ 2005-08-05 + * src/mh.c + src/session.c + src/mbox.c: braced Unix-specific code with #ifdef G_OS_UNIX. + * configure.in: added -lws2_32 on MinGW environment. + +2005-08-05 + * src/filter.c configure.in: check for regex.h and regcomp(). diff --git a/ChangeLog.ja b/ChangeLog.ja index 0cd124e1..59990c7e 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,12 @@ 2005-08-05 + * src/mh.c + src/session.c + src/mbox.c: Unix 特有のコードを #ifdef G_OS_UNIX で括った。 + * configure.in: MinGW 環境で -lws2_32 を付加。 + +2005-08-05 + * src/filter.c configure.in: regex.h と regcomp() をチェック。 diff --git a/configure.in b/configure.in index d5febe3f..800ce565 100644 --- a/configure.in +++ b/configure.in @@ -59,6 +59,7 @@ case "$target" in ;; *-*-mingw*) CFLAGS="$CFLAGS -mms-bitfields" + LIBS="$LIBS -lws2_32" ;; esac @@ -257,6 +257,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table) gint lock_mbox(const gchar *base, LockType type) { +#ifdef G_OS_UNIX gint retval = 0; if (type == LOCK_FILE) { @@ -327,6 +328,9 @@ gint lock_mbox(const gchar *base, LockType type) } return retval; +#else + return -1; +#endif /* G_OS_UNIX */ } gint unlock_mbox(const gchar *base, gint fd, LockType type) @@ -405,14 +405,18 @@ static gint mh_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list, if (first_ == 0 || first_ > dest->last_num + 1) first_ = dest->last_num + 1; +#ifdef G_OS_UNIX if (link(fileinfo->file, destfile) < 0) { +#endif if (copy_file(fileinfo->file, destfile, TRUE) < 0) { g_warning(_("can't copy message %s to %s\n"), fileinfo->file, destfile); g_free(destfile); return -1; } +#ifdef G_OS_UNIX } +#endif g_free(destfile); dest->last_num++; diff --git a/src/session.c b/src/session.c index 0aecb335..6e7fa4e9 100644 --- a/src/session.c +++ b/src/session.c @@ -275,11 +275,13 @@ static gint session_close(Session *session) { g_return_val_if_fail(session != NULL, -1); +#ifdef G_OS_UNIX if (session->conn_id > 0) { sock_connect_async_cancel(session->conn_id); session->conn_id = 0; debug_print("session (%p): connection cancelled\n", session); } +#endif session_set_timeout(session, 0); |