git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Robert Shearman <robertshearman@gmail.com>,
	git@vger.kernel.org, Robert Shearman <rob@codeweavers.com>
Subject: Re: [PATCH 2/4] git-imap-send: Add support for SSL.
Date: Wed, 09 Jul 2008 19:02:49 -0700	[thread overview]
Message-ID: <7v1w225wdy.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.1.10.0807091825500.11076@woody.linux-foundation.org> (Linus Torvalds's message of "Wed, 9 Jul 2008 18:31:02 -0700 (PDT)")

Linus Torvalds <torvalds@linux-foundation.org> writes:

> We should be able to safely include <ctype.h> as-is.
>
> It should just happen _before_ including git-compat-util.h. That's why 
> git-compat-util.h does all those #undef's - exactly because ctype.h does 
> get included on various systems by various header files when 
> git-compat-util.h includes all those other files.

Eh, that's true,... although I am not convinced we should keep doing this.

With and without NO_OPENSSL, on top of Robert's patch, these seem to pass
compile test.

--

 git-compat-util.h |    5 +++++
 imap-send.c       |    4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/git-compat-util.h b/git-compat-util.h
index 545df59..65c4671 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -99,6 +99,11 @@
 #include <iconv.h>
 #endif
 
+#ifndef NO_OPENSSL
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#endif
+
 /* On most systems <limits.h> would have given us this, but
  * not on some systems (e.g. GNU/Hurd).
  */
diff --git a/imap-send.c b/imap-send.c
index 9dc5d08..8026334 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -25,9 +25,6 @@
 #include "cache.h"
 #ifdef NO_OPENSSL
 typedef void *SSL;
-#else
-# include <openssl/ssl.h>
-# include <openssl/err.h>
 #endif
 
 typedef struct store_conf {

  reply	other threads:[~2008-07-10  2:04 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-09 21:29 [PATCH 2/4] git-imap-send: Add support for SSL Robert Shearman
2008-07-10  1:20 ` Junio C Hamano
2008-07-10  1:31   ` Linus Torvalds
2008-07-10  2:02     ` Junio C Hamano [this message]
2008-07-10  5:33 ` Mike Hommey
  -- strict thread matches above, loose matches on Subject: below --
2008-07-08 22:18 Robert Shearman
2008-07-08 23:20 ` Junio C Hamano
2008-07-09  2:28   ` Abhijit Menon-Sen
2008-07-09 12:02   ` Rob Shearman
2008-07-09 18:28     ` Junio C Hamano
2008-07-09 15:14 ` Josh Triplett
2008-07-09 21:24   ` Rob Shearman
2008-07-10  6:39     ` Jeff King

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=7v1w225wdy.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=rob@codeweavers.com \
    --cc=robertshearman@gmail.com \
    --cc=torvalds@linux-foundation.org \
    /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).