Changeset 5690:9205cac1fbb1 in roaraudio for include

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:

• include/libroar/vio_bio.h (modified) (2 diffs)

include/libroar/vio_bio.h

@@ -39 +39 @@
 #include "libroar.h"
 
-#ifndef ROAR_HAVE_LIBSSL
-typedef void BIO;
-#endif
-
+#ifdef ROAR_HAVE_LIBSSL
 int     roar_vio_open_bio      (struct roar_vio_calls * calls, BIO * bio);
 BIO *   roar_vio_to_bio        (struct roar_vio_calls * calls);
 
-#ifdef ROAR_HAVE_LIBSSL
 ssize_t roar_vio_bio_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_bio_write   (struct roar_vio_calls * vio, void *buf, size_t count);
@@ -52 +48 @@
 int     roar_vio_bio_sync    (struct roar_vio_calls * vio);
 int     roar_vio_bio_close   (struct roar_vio_calls * vio);
+#else
+int     roar_vio_open_bio      (struct roar_vio_calls * calls, void * bio);
+void *  roar_vio_to_bio        (struct roar_vio_calls * calls);
 #endif