From c768305c2f2203cf1fb9262a9f22b5a5f2dafebb Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Sat, 17 Mar 2001 22:13:19 +0000 Subject: Don't include system include dir. 2001-03-17 Jeffrey Stedfast * Makefile.am: Don't include system include dir. * camel.c: Use quotes around the nss.h include so it doesn't try to use the systen nss.h file. * camel-tcp-stream-ssl.c: Same here. svn path=/trunk/; revision=8786 --- camel/ChangeLog | 9 +++++++++ camel/Makefile.am | 2 +- camel/camel-tcp-stream-ssl.c | 3 +-- camel/camel.c | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index b14322244f..91dfe7267b 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,12 @@ +2001-03-17 Jeffrey Stedfast + + * Makefile.am: Don't include system include dir. + + * camel.c: Use quotes around the nss.h include so it doesn't try + to use the systen nss.h file. + + * camel-tcp-stream-ssl.c: Same here. + 2001-03-17 Not Zed * providers/local/camel-maildir-summary.c (maildir_summary_sync): diff --git a/camel/Makefile.am b/camel/Makefile.am index 8c77f7fad6..1b99bf9847 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -7,7 +7,7 @@ providerdir = $(libdir)/evolution/camel-providers/$(VERSION) lib_LTLIBRARIES = libcamel.la -INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \ +INCLUDES = -I.. -I$(srcdir)/.. \ -I$(top_srcdir)/intl \ -I$(top_srcdir)/e-util \ $(GLIB_CFLAGS) \ diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c index 8aa4080660..708c58e364 100644 --- a/camel/camel-tcp-stream-ssl.c +++ b/camel/camel-tcp-stream-ssl.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include "nss.h" /* Don't use <> here or it will include the system nss.h instead */ #include static CamelTcpStreamClass *parent_class = NULL; @@ -335,7 +335,6 @@ ssl_bad_cert (void *data, PRFileDesc *sockfd) CamelService *service; char *prompt, *cert_str; gpointer accept; - PRUint32 len; g_return_val_if_fail (data != NULL, SECFailure); g_return_val_if_fail (CAMEL_IS_SERVICE (data), SECFailure); diff --git a/camel/camel.c b/camel/camel.c index ba70162aca..8233e98925 100644 --- a/camel/camel.c +++ b/camel/camel.c @@ -29,7 +29,7 @@ #ifdef HAVE_NSS #include #include -#include +#include "nss.h" /* Don't use <> here or it will include the system nss.h instead */ #include #endif /* HAVE_NSS */ -- cgit v1.2.3