← Back to branch summary

~brianaker/gearmand/warning-usage

« back to all changes in this revision

Viewing changes to util/instance.hpp

  • Committer: Brian Aker
  • Date: 2013-08-07 22:23:36 UTC
  • mto: This revision was merged to the branch mainline in revision 853.
  • Revision ID: brian@tangent.org-20130807222336-6gs9tjksajrolatc
Additional SSL cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
util/instance.hpp
48
48
 
49
49
#include "util/operation.hpp"
50
50
 
51
 
#if defined(HAVE_CYASSL) && HAVE_CYASSL
52
 
# include <cyassl/ssl.h>
53
 
#endif
54
 
 
55
 
#include "configmake.h"
56
 
 
 
51
#include "libgearman/ssl.h"
57
52
 
58
53
struct addrinfo;
59
54
 
132
127
  struct addrinfo *_addrinfo_next;
133
128
  Finish *_finish_fn;
134
129
  Operation::vector _operations;
135
 
  struct CYASSL_CTX* _ctx_ssl;
136
 
  struct CYASSL* _ssl;
 
130
  SSL_CTX* _ctx_ssl;
 
131
  SSL* _ssl;
137
132
 
138
133
  const char* ssl_ca_file() const
139
134
  {