* Experimental: Elimination of the w32 build code for PC-Alpine.

     Now w32 and wnt are the same code, so we are only left with wnt
     and wxp.

4 files changed, 9 insertions, 9 deletions

diff --git a/pith/conf.c b/pith/conf.c
index 8b977ae2..cbbe7558 100644
--- a/pith/conf.c
+++ b/pith/conf.c
@@ -377,7 +377,7 @@ CONF_TXT_T cf_text_mailcap_path[] =	"Sets the search path for the mailcap config
 
 CONF_TXT_T cf_text_mimetype_path[] =	"Sets the search path for the mimetypes configuration file.\n# NOTE: colon delimited under UNIX, semi-colon delimited under DOS/Windows/OS2.";
 
-#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS)
+#if !defined(_WINDOWS) || defined(WINDOWS_UNIXSSL_CERTS)
 CONF_TXT_T cf_text_system_certs_path[] = "Sets the path for the system ssl certificates issued by a trusted\n# certificate authority. Note that this could be a list of paths, if the same\n# pinerc is used in different systems. Alpine always chooses the first one that\n# it finds. Value must be an absolute path.";
 
 CONF_TXT_T cf_text_system_certs_file[] = "Sets the path for the system ssl file container of certificates issued by a\n# certificate authority. Note that this could be a list of container files,\n# if the same pinerc is used in different systems. Alpine always chooses the,\n# first one that it finds. Value must be an absolute path.";
@@ -665,7 +665,7 @@ static struct variable variables[] = {
 	NULL,			cf_text_mailcap_path},
 {"mimetype-search-path",		0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
 	NULL,			cf_text_mimetype_path},
-#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS)
+#if !defined(_WINDOWS) || defined(WINDOWS_UNIXSSL_CERTS)
 {"system-certs-path",			0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0,
 	"System CACerts Dir",	cf_text_system_certs_path},
 {"system-certs-file",			0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0,
@@ -2382,7 +2382,7 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **))
     set_current_val(&vars[V_DOWNLOAD_CMD_PREFIX], TRUE, TRUE);
     set_current_val(&vars[V_MAILCAP_PATH], TRUE, TRUE);
     set_current_val(&vars[V_MIMETYPE_PATH], TRUE, TRUE);
-#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS)
+#if !defined(_WINDOWS) || defined(WINDOWS_UNIXSSL_CERTS)
     set_current_val(&vars[V_SSLCAPATH], TRUE, TRUE);
     set_current_val(&vars[V_SSLCAFILE], TRUE, TRUE);
 #endif
@@ -7072,7 +7072,7 @@ feature_gets_an_x(struct pine *ps, struct variable *var, FEATURE_S *feature,
 			  test_old_growth_bits(ps, feature->id)))));
 }
 
-#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS)
+#if !defined(_WINDOWS) || defined(WINDOWS_UNIXSSL_CERTS)
 void
 set_system_certs_path(struct pine *ps)
 { 
@@ -7961,7 +7961,7 @@ config_help(int var, int feature)
 	return(h_config_mailcap_path);
       case V_MIMETYPE_PATH :
 	return(h_config_mimetype_path);
-#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS)
+#if !defined(_WINDOWS) || defined(WINDOWS_UNIXSSL_CERTS)
       case V_SSLCAPATH :
 	return(h_config_system_certs_path);
       case V_SSLCAFILE :
diff --git a/pith/conf.h b/pith/conf.h
index e9023cc4..bd72563b 100644
--- a/pith/conf.h
+++ b/pith/conf.h
@@ -133,7 +133,7 @@
 #define VAR_COLOR_STYLE		     vars[V_COLOR_STYLE].current_val.p
 #define GLO_COLOR_STYLE		     vars[V_COLOR_STYLE].global_val.p
 #endif
-#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS)
+#if !defined(_WINDOWS) || defined(WINDOWS_UNIXSSL_CERTS)
 #define VAR_SSLCAPATH		     vars[V_SSLCAPATH].current_val.l
 #define GLO_SSLCAPATH		     vars[V_SSLCAPATH].global_val.l
 #define VAR_SSLCAFILE		     vars[V_SSLCAFILE].current_val.l
@@ -918,7 +918,7 @@ char     **get_supported_options(void);
 unsigned   reset_startup_rule(MAILSTREAM *);
 void	   free_pinerc_lines(PINERC_LINE **);
 void	   panic1(char *, char *);
-#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS)
+#if !defined(_WINDOWS) || defined(WINDOWS_UNIXSSL_CERTS)
 void	   set_system_certs_path(struct pine *);
 void	   set_system_certs_container(struct pine *);
 #endif
diff --git a/pith/conftype.h b/pith/conftype.h
index 38f62416..3f0f1e3c 100644
--- a/pith/conftype.h
+++ b/pith/conftype.h
@@ -124,7 +124,7 @@ typedef	enum {    V_PERSONAL_NAME = 0
 		, V_DOWNLOAD_CMD_PREFIX
 		, V_MAILCAP_PATH
 		, V_MIMETYPE_PATH
-#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS)
+#if !defined(_WINDOWS) || defined(WINDOWS_UNIXSSL_CERTS)
 		, V_SSLCAPATH
 		, V_SSLCAFILE
 #endif
diff --git a/pith/pine.hlp b/pith/pine.hlp
index b913eaef..c5f42578 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 478 2020-07-03 01:22:39
+Alpine Commit 479 2020-07-03 02:14:30
 ============= h_news =================
 <HTML>
 <HEAD>