git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Erik Faye-Lund <kusmabite@googlemail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Erik Faye-Lund <kusmabite@gmail.com>
Subject: [PATCH 4/8] imap-send: fix compilation-error on Windows
Date: Fri,  9 Oct 2009 17:04:38 +0200	[thread overview]
Message-ID: <1255100682-13952-4-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1255100682-13952-3-git-send-email-kusmabite@gmail.com>

mmsystem.h (included from windows.h) defines DRV_OK to 1. To avoid
an error due to DRV_OK redefenition, this patch undefines the old
definition (i.e the one from mmsystem.h) before defining DRV_OK.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
 imap-send.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/imap-send.c b/imap-send.c
index dc3da98..ed51dbf 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -94,6 +94,10 @@ struct msg_data {
 	unsigned int crlf:1;
 };
 
+#ifdef DRV_OK
+#undef DRV_OK
+#endif
+
 #define DRV_OK          0
 #define DRV_MSG_BAD     -1
 #define DRV_BOX_BAD     -2
-- 
1.6.5.rc1.60.g41795

  reply	other threads:[~2009-10-09 15:11 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-09 15:04 [PATCH 1/8] imap-send: remove useless uid code Erik Faye-Lund
2009-10-09 15:04 ` [PATCH 2/8] imap-send: use separate read and write fds Erik Faye-Lund
2009-10-09 15:04   ` [PATCH 3/8] imap-send: use run-command API for tunneling Erik Faye-Lund
2009-10-09 15:04     ` Erik Faye-Lund [this message]
2009-10-09 15:04       ` [PATCH 5/8] imap-send: build imap-send on Windows Erik Faye-Lund
2009-10-09 15:04         ` [PATCH 6/8] mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle Erik Faye-Lund
2009-10-09 15:04           ` [PATCH 7/8] mingw: enable OpenSSL Erik Faye-Lund
2009-10-09 15:04             ` [PATCH 8/8] MSVC: Enable OpenSSL, and translate -lcrypto Erik Faye-Lund
2009-10-09 15:42       ` [PATCH 4/8] imap-send: fix compilation-error on Windows Matt Kraai
2009-10-09 15:21 ` [PATCH 1/8] imap-send: remove useless uid code Sverre Rabbelier
2009-10-09 16:12   ` Erik Faye-Lund
2009-10-10  0:57   ` Junio C Hamano
2009-10-09 15:46 ` Matt Kraai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1255100682-13952-4-git-send-email-kusmabite@gmail.com \
    --to=kusmabite@googlemail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=kusmabite@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).