From d10e85eada71599caebb56fde50dd42bbbf6b65d Mon Sep 17 00:00:00 2001
From: Brian Bockelman <bbockelm@cse.unl.edu>
Date: Tue, 28 Jul 2015 21:24:36 -0500
Subject: [PATCH] Allow compilation with both old and new Globus version. #5180

The signature of globus_gsi_cred_write_proxy changed from

globus_result_t
globus_gsi_cred_write_proxy(globus_l_gsi_cred_handle_s*, char*)

to

globus_result_t
globus_gsi_cred_write_proxy(globus_l_gsi_cred_handle_s*, const char*)

This causes a function pointer assignment to fail.  Since we want to support
both the old and new interface, simply reinterpret_cast the pointer to the
correct type.

Tested compilation against both globus-gsi-credential 7.7 and 7.9.
---
 src/condor_utils/globus_utils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/condor_utils/globus_utils.cpp b/src/condor_utils/globus_utils.cpp
index 2027e3e..1810b74 100644
--- a/src/condor_utils/globus_utils.cpp
+++ b/src/condor_utils/globus_utils.cpp
@@ -354,7 +354,7 @@ activate_globus_gsi( void )
 	globus_gsi_cred_handle_destroy_ptr = globus_gsi_cred_handle_destroy;
 	globus_gsi_cred_handle_init_ptr = globus_gsi_cred_handle_init;
 	globus_gsi_cred_read_proxy_ptr = globus_gsi_cred_read_proxy;
-	globus_gsi_cred_write_proxy_ptr = globus_gsi_cred_write_proxy;
+	globus_gsi_cred_write_proxy_ptr = reinterpret_cast<globus_result_t (*)(globus_l_gsi_cred_handle_s*, char*)>(globus_gsi_cred_write_proxy);
 	globus_gsi_proxy_assemble_cred_ptr = globus_gsi_proxy_assemble_cred;
 	globus_gsi_proxy_create_req_ptr = globus_gsi_proxy_create_req;
 	globus_gsi_proxy_handle_attrs_destroy_ptr = globus_gsi_proxy_handle_attrs_destroy;