Merge branch '2.0' into develop

2016-09-20 22:36:35 +03:00
parent 62ab834e8a 715f978051
commit ca9021b835
17 changed files with 156 additions and 119 deletions
--- a/server/core/buffer.c
+++ b/server/core/buffer.c
@ -380,9 +380,9 @@ GWBUF* gwbuf_clone_all(GWBUF* buf)
 }


-GWBUF *gwbuf_clone_portion(GWBUF *buf,
-                           size_t start_offset,
-                           size_t length)
+static GWBUF *gwbuf_clone_portion(GWBUF *buf,
+                                  size_t start_offset,
+                                  size_t length)
 {
    GWBUF* clonebuf;