[Spice-commits] 2 commits - server/websocket.h

[GitLab Mirror]

 server/websocket.h |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 705ae9c197f75187ef657c127199d5d94e0cf938
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Jun 27 16:02:55 2019 +0100

    websocket: Make header self-independent
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Uri Lublin <uril at redhat.com>

diff --git a/server/websocket.h b/server/websocket.h
index 7707e680..ec452038 100644
--- a/server/websocket.h
+++ b/server/websocket.h
@@ -18,6 +18,10 @@
 #ifndef WEBSOCKET_H_
 #define WEBSOCKET_H_
 
+#include <inttypes.h>
+
+#include "sys-socket.h"
+
 typedef ssize_t (*websocket_read_cb_t)(void *opaque, void *buf, size_t nbyte);
 typedef ssize_t (*websocket_write_cb_t)(void *opaque, const void *buf, size_t nbyte);
 typedef ssize_t (*websocket_writev_cb_t)(void *opaque, struct iovec *iov, int iovcnt);
commit 3a8c0bc28daa045e9d9848ded02c7cac8d84d039
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Jun 27 16:02:34 2019 +0100

    websocket: Add header guards
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Uri Lublin <uril at redhat.com>

diff --git a/server/websocket.h b/server/websocket.h
index 22120d93..7707e680 100644
--- a/server/websocket.h
+++ b/server/websocket.h
@@ -15,6 +15,9 @@
  *  License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef WEBSOCKET_H_
+#define WEBSOCKET_H_
+
 typedef ssize_t (*websocket_read_cb_t)(void *opaque, void *buf, size_t nbyte);
 typedef ssize_t (*websocket_write_cb_t)(void *opaque, const void *buf, size_t nbyte);
 typedef ssize_t (*websocket_writev_cb_t)(void *opaque, struct iovec *iov, int iovcnt);
@@ -41,3 +44,5 @@ void websocket_free(RedsWebSocket *ws);
 int websocket_read(RedsWebSocket *ws, uint8_t *buf, size_t len, unsigned *flags);
 int websocket_write(RedsWebSocket *ws, const void *buf, size_t len, unsigned flags);
 int websocket_writev(RedsWebSocket *ws, const struct iovec *iov, int iovcnt, unsigned flags);
+
+#endif