Changeset 5690:9205cac1fbb1 in roaraudio for libroar

Timestamp:

10/12/12 17:10:53 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Improved handling of mixing OpenSSL enabled applications with libroar without OpenSSL support.

File:

• libroar/vio_bio.c (modified) (4 diffs)

libroar/vio_bio.c

@@ -36 +36 @@
 #include "libroar.h"
 
+#ifdef ROAR_HAVE_LIBSSL
 int     roar_vio_open_bio      (struct roar_vio_calls * calls, BIO * bio) {
-#ifdef ROAR_HAVE_LIBSSL
  if ( calls == NULL || bio == NULL )
   return -1;
@@ -54 +54 @@
 
  return 0;
-#else
- (void)calls, (void)bio;
- roar_err_set(ROAR_ERROR_NOSYS);
- return -1;
-#endif
 }
 
@@ -66 +61 @@
 }
 
-#ifdef ROAR_HAVE_LIBSSL
 ssize_t roar_vio_bio_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
  BIO * bio = (BIO*)(vio->inst);
@@ -106 +100 @@
 #endif
 
+#ifndef ROAR_HAVE_LIBSSL
+int     roar_vio_open_bio      (struct roar_vio_calls * calls, void * bio) {
+ (void)calls, (void)bio;
+ roar_err_set(ROAR_ERROR_NOSYS);
+ return -1;
+}
+
+void *  roar_vio_to_bio        (struct roar_vio_calls * calls) {
+ roar_err_set(ROAR_ERROR_NOSYS);
+ return NULL;
+}
+#endif
+
 //ll