Deprecate the macro MAC_OS_pre_X.

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 541f4945f4f6d45c3eceb65c22d72d0e52ab9d0b..b366281e8ebf31fa667e8f14a1633f57db79d6f7 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1125,7 +1125,7 @@ int       SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
                                            const char *file);
 #ifndef OPENSSL_SYS_WIN32
 #ifndef OPENSSL_SYS_VMS
-#ifndef MAC_OX_pre_X
+#ifndef OPENSSL_SYS_MACINTOSH_CLASSIC /* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */
 int    SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
                                           const char *dir);
 #endif

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index cf7102bdc22900e0af6159737e4228b8fb16986c..d78584715a7589a175a708b5c2a8a225c25ab04f 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -728,7 +728,7 @@ err:
 
 #ifndef OPENSSL_SYS_WIN32
 #ifndef OPENSSL_SYS_VMS                /* XXXX This may be fixed in the future */
-#ifndef MAC_OS_pre_X
+#ifndef OPENSSL_SYS_MACINTOSH_CLASSIC /* XXXXX: Better scheme needed! */
 
 int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
                                       const char *dir)