Further comment changes for reformat (master)

[openssl.git] / ssl / kssl.h

diff --git a/ssl/kssl.h b/ssl/kssl.h
index 8242fd5eeb650c0ac775e14a1cf7fe7a0ac32836..c61dba7432ffc2d3e7aeb9b0b7b6e5abc80c90ba 100644 (file)
--- a/ssl/kssl.h
+++ b/ssl/kssl.h
@@ -70,15 +70,24 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <krb5.h>
+#ifdef OPENSSL_SYS_WIN32
+/* These can sometimes get redefined indirectly by krb5 header files
+ * after they get undefed in ossl_typ.h
+ */
+#undef X509_NAME
+#undef X509_EXTENSIONS
+#undef OCSP_REQUEST
+#undef OCSP_RESPONSE
+#endif
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
 /*
-**     Depending on which KRB5 implementation used, some types from
-**     the other may be missing.  Resolve that here and now
-*/
+ *     Depending on which KRB5 implementation used, some types from
+ *     the other may be missing.  Resolve that here and now
+ */
 #ifdef KRB5_HEIMDAL
 typedef unsigned char krb5_octet;
 #define FAR
@@ -90,11 +99,12 @@ typedef unsigned char krb5_octet;
 
 #endif
 
-/*     Uncomment this to debug kssl problems or
-**     to trace usage of the Kerberos session key
-**
-**     #define         KSSL_DEBUG
-*/
+/*-
+ *     Uncomment this to debug kssl problems or
+ *     to trace usage of the Kerberos session key
+ *
+ *     #define         KSSL_DEBUG
+ */
 
 #ifndef        KRB5SVC
 #define KRB5SVC        "host"
@@ -123,10 +133,10 @@ typedef struct kssl_err_st  {
        } KSSL_ERR;
 
 
-/*     Context for passing
-**             (1) Kerberos session key to SSL, and
-**             (2)     Config data between application and SSL lib
-*/
+/*-    Context for passing
+ *             (1) Kerberos session key to SSL, and
+ *             (2)     Config data between application and SSL lib
+ */
 typedef struct kssl_ctx_st
         {
                                 /*     used by:    disposition:            */