From 0cb3570746e2e00094217ddd8d6cb11e7c42e49d Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 2 Oct 2002 01:38:31 +0000
Subject: [PATCH] win32 workarounds

---
 panda/src/downloader/httpClient.cxx | 2 +-
 panda/src/downloader/httpClient.h   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/panda/src/downloader/httpClient.cxx b/panda/src/downloader/httpClient.cxx
index 565682b781..214dbbe5a8 100644
--- a/panda/src/downloader/httpClient.cxx
+++ b/panda/src/downloader/httpClient.cxx
@@ -954,7 +954,7 @@ parse_x509_name(const string &source) {
         }
       }
 
-      int nid = OBJ_txt2nid(type.c_str());
+      int nid = OBJ_txt2nid((char *)type.c_str());
       if (nid == NID_undef) {
         downloader_cat.info()
           << "Unknown type " << type << " in X509 name: " << source
diff --git a/panda/src/downloader/httpClient.h b/panda/src/downloader/httpClient.h
index 2a625ecd03..671b891101 100644
--- a/panda/src/downloader/httpClient.h
+++ b/panda/src/downloader/httpClient.h
@@ -34,6 +34,11 @@
 
 #include <openssl/ssl.h>
 
+// Windows may define this macro inappropriately.
+#ifdef WIN32
+#undef X509_NAME
+#endif
+
 class Filename;
 
 ////////////////////////////////////////////////////////////////////