Merge "citrix" branch into "master".

[openvswitch] / lib / stream.c

diff --git a/lib/stream.c b/lib/stream.c
index 8d97afe98e5c0ff606cc59f76c2a4895a05750fb..db6ec61bb443aaebf212a4118f7d3224f908e9a0 100644 (file)
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -48,11 +48,17 @@ enum stream_state {
 static struct stream_class *stream_classes[] = {
     &tcp_stream_class,
     &unix_stream_class,
+#ifdef HAVE_OPENSSL
+    &ssl_stream_class,
+#endif
 };
 
 static struct pstream_class *pstream_classes[] = {
     &ptcp_pstream_class,
     &punix_pstream_class,
+#ifdef HAVE_OPENSSL
+    &pssl_pstream_class,
+#endif
 };
 
 /* Check the validity of the stream class structures. */
@@ -96,7 +102,7 @@ check_stream_classes(void)
  * connection methods supported by the stream. */
 void
 stream_usage(const char *name, bool active, bool passive,
-             bool bootstrap UNUSED)
+             bool bootstrap OVS_UNUSED)
 {
     /* Really this should be implemented via callbacks into the stream
      * providers, but that seems too heavy-weight to bother with at the