Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> 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 {
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
