X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=22723ed454dead67a35763cde3e432c7662eb6d1;hp=62f84a383dd0390469f9410e56dba2203ad47d6b;hb=91acd32003fb8eb9b3b05b35c1aa32a6c07aad43;hpb=008170b67979fad71bc48537eeb879f51610275a diff --git a/globals.h b/globals.h index 62f84a3..22723ed 100644 --- a/globals.h +++ b/globals.h @@ -49,9 +49,9 @@ WHERE char *Maildir; #ifdef USE_HCACHE WHERE char *HeaderCache; -#if defined(HAVE_GDBM) || defined(HAVE_DB4) +#if defined(HAVE_GDBM) WHERE char *HeaderCachePageSize; -#endif /* HAVE_GDBM || HAVE_DB4 */ +#endif /* HAVE_GDBM */ #endif /* USE_HCACHE */ WHERE char *MhFlagged; WHERE char *MhReplied; @@ -112,20 +112,6 @@ WHERE char *SmtpUseTLS; #endif WHERE char *Spoolfile; -#if defined(USE_SSL) || defined(USE_GNUTLS) -WHERE char *SslCertFile INITVAL (NULL); -#endif -#if defined(USE_SSL) -WHERE char *SslEntropyFile INITVAL (NULL); -#endif -#ifdef USE_SSL -WHERE char *SslClientCert INITVAL (NULL); -WHERE string_list_t *SslSessionCerts INITVAL (NULL); -#endif -#ifdef USE_GNUTLS -WHERE short SslDHPrimeBits; -WHERE char *SslCACertFile INITVAL (NULL); -#endif WHERE char *StChars; WHERE char *Status; WHERE char *Tochars; @@ -188,7 +174,6 @@ WHERE string_list_t *UserHeader INITVAL (0); /*-- formerly in pgp.h --*/ WHERE char *PgpSignAs; -WHERE char *PgpEntryFormat; /*-- formerly in smime.h --*/ WHERE char *SmimeDefaultKey;