summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2020-07-03 02:14:33 -0600
committerEduardo Chappa <chappa@washington.edu>2020-07-03 02:14:33 -0600
commitf6a3f80237f4b565e97aa72130444d8262c723b8 (patch)
treecc25d85a4bc4900fd22961a40f56a55b04a23a30 /include
parent55740c0e9b40562cbc8081ce32b2a542392fd12b (diff)
downloadalpine-f6a3f80237f4b565e97aa72130444d8262c723b8.tar.xz
* 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.
Diffstat (limited to 'include')
-rw-r--r--include/config.wnt.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/include/config.wnt.h b/include/config.wnt.h
index b092d29b..65f1533b 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 */