* 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.

9 files changed, 18 insertions, 34 deletions

diff --git a/alpine/alpine.c b/alpine/alpine.c
index e11a47c..55bd581 100644
--- a/alpine/alpine.c
+++ b/alpine/alpine.c
@@ -472,7 +472,7 @@ main(int argc, char **argv)
 
     init_vars(pine_state, process_init_cmds);
 
-#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS)
+#if !defined(_WINDOWS) || defined(WINDOWS_UNIXSSL_CERTS)
     set_system_certs_path(pine_state);
     set_system_certs_container(pine_state);
 #endif
diff --git a/alpine/confscroll.c b/alpine/confscroll.c
index db7d2cf..c8760eb 100644
--- a/alpine/confscroll.c
+++ b/alpine/confscroll.c
@@ -5783,7 +5783,7 @@ fix_side_effects(struct pine *ps, struct variable *var, int revert)
 #ifdef DF_ENCRYPTION_RANGE
 		        var == &ps->vars[V_ENCRYPTION_RANGE] ||
 #endif
-#if !defined(_WINDOWS) || defined(ENABLE_WINDOWS_LIBRESSL_CERTS)
+#if !defined(_WINDOWS) || defined(ENABLE_WINDOWS_UNIXSSL_CERTS)
 			var == &ps->vars[V_SSLCAPATH] ||
 			var == &ps->vars[V_SSLCAFILE] ||
 #endif
diff --git a/build.bat b/build.bat
index 762cb06..2a1038c 100755
--- a/build.bat
+++ b/build.bat
@@ -23,7 +23,6 @@ set sslextralibes="crypt32.lib"
 if "%1"=="" goto blank
 if "%1"=="wnt" goto wnt
 if "%1"=="wxp" goto wxp
-if "%1"=="w32" goto w32
 if "%1"=="w2k" goto w2k
 if "%1"=="clean" goto clean
 echo Unknown build command: %1 %2 %3 %4
@@ -34,7 +33,6 @@ echo Must specify build command!
 echo usage: BUILD cmd
 echo   where "cmd" is one of either:
 echo         wnt        -- Windows
-echo         w32        -- Windows 32 bits (not Windows XP)
 echo         wxp        -- Windows XP
 echo         w2k        -- Windows with Win2k Kerb
 echo         clean      -- to remove obj, lib, and exe files from source
@@ -53,16 +51,6 @@ set ssllibes=\"%ALPINE_LIBRESSL%\"\x86\libcrypto-%CRYPTO_VERSION%.lib \"%ALPINE_
 set sslextralibes=
 goto wntbuild
 
-:w32
-if not defined ALPINE_OPENSSL set ALPINE_OPENSSL=%cd%\openssl
-if NOT exist "%ALPINE_OPENSSL%" goto wntbuild
-set MESSAGE=including OPENSSL support
-set windows32build=-DW32BITSBUILD -D__MINGW_USE_VC2005_COMPAT
-set sslflags=-I\"%ALPINE_OPENSSL%\"\include\ -I\"%ALPINE_OPENSSL%\"\include\openssl -DENABLE_WINDOWS_UNIXSSL -DOPENSSL_1_1_0
-set ssllibes=\"%ALPINE_OPENSSL%\"\lib\libcrypto.lib \"%ALPINE_OPENSSL%\"\lib\libssl.lib
-set sslextralibes=
-goto wntbuild
-
 :wnt
 if not defined ALPINE_OPENSSL set ALPINE_OPENSSL=%cd%\openssl
 if NOT exist "%ALPINE_OPENSSL%" goto wntbuild
diff --git a/imap/src/osdep/nt/ssl_nt.c b/imap/src/osdep/nt/ssl_nt.c
index 39368f0..02fe732 100644
--- a/imap/src/osdep/nt/ssl_nt.c
+++ b/imap/src/osdep/nt/ssl_nt.c
@@ -23,7 +23,7 @@
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  */
-#if defined(ENABLE_WINDOWS_LIBRESSL) && (defined(W32BITSBUILD) || defined(WXPBUILD))
+#if defined(ENABLE_WINDOWS_UNIXSSL) && defined(WXPBUILD)
 #include "ssl_libressl.c"
 #else
 #include "ssl_win.c"
diff --git a/include/config.wnt.h b/include/config.wnt.h
index b092d29..65f1533 100644
--- a/include/config.wnt.h
+++ b/include/config.wnt.h
@@ -541,7 +541,7 @@
 #define S_FILESEP "\\"
 
 /* Enable S/MIME if LibreSSL */
-#ifdef ENABLE_WINDOWS_LIBRESSL
+#ifdef ENABLE_WINDOWS_UNIXSSL
 #define SMIME
 /* Location of certificates in the system */
 #define SMIME_SSLCERTS "C:\\libressl\\ssl\\certs"
@@ -563,21 +563,17 @@
 
 /* Name of default certificate authority container */
 #define DF_CA_CONTAINER "CAContainer"
-#endif /* ENABLE_WINDOWS_LIBRESSL */
-
-#if defined(ENABLE_WINDOWS_LIBRESSL) && (defined(W32BITSBUILD) || defined(WXPBUILD))
-#define WINDOWS_LIBRESSL_CERTS
-#if defined(W32BITSBUILD)
-#define DEFAULT_SSLCAPATH "certs"
-#define DEFAULT_SSLCAFILE "certs\\cert.pem"
-#endif /* W32BITSBUILD */
+#endif /* ENABLE_WINDOWS_UNIXSSL */
+
+#if defined(ENABLE_WINDOWS_UNIXSSL) && defined(WXPBUILD)
+#define WINDOWS_UNIXSSL_CERTS
 #if defined(WXPBUILD)
 #define DEFAULT_SSLCAPATH "C:\\libressl\\ssl\\certs"
 #define DEFAULT_SSLCAFILE "C:\\libressl\\ssl\\certs\\cert.pem"
 #endif /* WXPBUILD */
 #else
 #undef DF_ENCRYPTION_RANGE
-#endif /* defined(ENABLE_WINDOWS_LIBRESSL) && (defined(W32BITSBUILD) || defined(WXPBUILD)) */ 
+#endif /* defined(ENABLE_WINDOWS_UNIXSSL) &&  defined(WXPBUILD) */ 
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 /* #define TIME_WITH_SYS_TIME */
diff --git a/pith/conf.c b/pith/conf.c
index 8b977ae..cbbe755 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 e9023cc..bd72563 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 38f6241..3f0f1e3 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 b913eae..c5f4257 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>