Index: ChangeLog
==================================================================
--- ChangeLog
+++ ChangeLog
@@ -1,6 +1,9 @@
 2004-06-29  Pat Thoyts  <patthoyts@users.sourceforge.net>
+
+	* tlsInt.h:         Added headers required with MSVC on Win32.
+	* tlsX509.c:        undef min and max if defined (win32).
 
 	* Makefile.in:      Fixed to build on win32 using msys with
 	* aclocal.m4:       MSVC. Also fixed the test target.
 	* configure.in:
 	* configure:        Regenerated.

Index: tlsInt.h
==================================================================
--- tlsInt.h
+++ tlsInt.h
@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsInt.h,v 1.12 2004/03/24 05:22:53 razzell Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsInt.h,v 1.13 2004/06/29 10:58:08 patthoyts Exp $
  *
  * TLS (aka SSL) Channel - can be layered on any bi-directional
  * Tcl_Channel (Note: Requires Trf Core Patch)
  *
  * This was built from scratch based upon observation of OpenSSL 0.9.2B
@@ -21,10 +21,16 @@
 #define _TLSINT_H
 
 #include "tls.h"
 #include <errno.h>
 #include <string.h>
+
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <wincrypt.h> /* OpenSSL needs this on Windows */
+#endif
 
 #ifdef NO_PATENTS
 #define NO_IDEA
 #define NO_RC2
 #define NO_RC4

Index: tlsX509.c
==================================================================
--- tlsX509.c
+++ tlsX509.c
@@ -1,13 +1,24 @@
 /*
  * Copyright (C) 1997-2000 Sensus Consulting Ltd.
  * Matt Newman <matt@sensus.org>
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsX509.c,v 1.4 2004/03/17 17:53:57 razzell Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsX509.c,v 1.5 2004/06/29 10:58:08 patthoyts Exp $
  */
 #include "tlsInt.h"
 
+/*
+ *  Ensure these are not macros - known to be defined on Win32 
+ */
+#ifdef min
+#undef min
+#endif
+
+#ifdef max
+#undef max
+#endif
+
 static int min(int a, int b)
 {
     return (a < b) ? a : b;
 }