Merge branch 'silc.1.1.branch' of silc repo

[runtime.git] / lib / silcutil / silcsocketstream_i.h

diff --git a/lib/silcutil/silcsocketstream_i.h b/lib/silcutil/silcsocketstream_i.h
index b82024fa711cd6b3ffd006e68a98c44a45a27a74..aa080ccc4b8e0290eb37a44a52000470db77837e 100644 (file)
--- a/lib/silcutil/silcsocketstream_i.h
+++ b/lib/silcutil/silcsocketstream_i.h
@@ -55,13 +55,14 @@ struct SilcSocketStreamStruct {
   unsigned int connected : 1;      /* UDP connected state */
 };
 
-#define SILC_IS_SOCKET_STREAM(s) (s->ops == &silc_socket_stream_ops)
-#define SILC_IS_SOCKET_STREAM_UDP(s) (s->ops == &silc_socket_udp_stream_ops)
+#define SILC_IS_SOCKET_STREAM(s) (s && s->ops == &silc_socket_stream_ops)
+#define SILC_IS_SOCKET_STREAM_UDP(s) (s && s->ops == &silc_socket_udp_stream_ops)
 
 extern const SilcStreamOps silc_socket_stream_ops;
 extern const SilcStreamOps silc_socket_udp_stream_ops;
 
 /* Backwards support */
+#define SilcSocketStreamStatus SilcResult
 #define silc_socket_stream_get_error(stream) silc_errno
 #define SILC_SOCKET_OK SILC_OK
 #define SILC_SOCKET_UNKNOWN_IP SILC_ERR_UNKNOWN_IP