Fix warnings in C89 builds

Author: ccawley2011

nuklear.h

@@ -9216,6 +9216,7 @@ NK_API void
 nk_draw_nine_slice(struct nk_command_buffer *b, struct nk_rect r,
     const struct nk_nine_slice *slc, struct nk_color col)
 {
+    struct nk_image img;
     const struct nk_image *slcimg = (const struct nk_image*)slc;
     nk_ushort rgnX, rgnY, rgnW, rgnH;
     rgnX = slcimg->region[0];
@@ -9224,8 +9225,14 @@ nk_draw_nine_slice(struct nk_command_buffer *b, struct nk_rect r,
     rgnH = slcimg->region[3];
 
     /* top-left */
-    struct nk_image img = {slcimg->handle, slcimg->w, slcimg->h,
-        {rgnX, rgnY, slc->l, slc->t}};
+    img.handle = slcimg->handle;
+    img.w = slcimg->w;
+    img.h = slcimg->h;
+    img.region[0] = rgnX;
+    img.region[1] = rgnY;
+    img.region[2] = slc->l;
+    img.region[3] = slc->t;
+
     nk_draw_image(b,
         nk_rect(r.x, r.y, (float)slc->l, (float)slc->t),
         &img, col);
@@ -23483,8 +23490,8 @@ NK_API struct nk_nine_slice
 nk_sub9slice_ptr(void *ptr, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     i->handle.ptr = ptr;
     i->w = w; i->h = h;
     i->region[0] = (nk_ushort)rgn.x;
@@ -23498,8 +23505,8 @@ NK_API struct nk_nine_slice
 nk_sub9slice_id(int id, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     i->handle.id = id;
     i->w = w; i->h = h;
     i->region[0] = (nk_ushort)rgn.x;
@@ -23513,8 +23520,8 @@ NK_API struct nk_nine_slice
 nk_sub9slice_handle(nk_handle handle, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     i->handle = handle;
     i->w = w; i->h = h;
     i->region[0] = (nk_ushort)rgn.x;
@@ -23528,8 +23535,8 @@ NK_API struct nk_nine_slice
 nk_nine_slice_handle(nk_handle handle, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     i->handle = handle;
     i->w = 0; i->h = 0;
     i->region[0] = 0;
@@ -23543,8 +23550,8 @@ NK_API struct nk_nine_slice
 nk_nine_slice_ptr(void *ptr, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     NK_ASSERT(ptr);
     i->handle.ptr = ptr;
     i->w = 0; i->h = 0;
@@ -23559,8 +23566,8 @@ NK_API struct nk_nine_slice
 nk_nine_slice_id(int id, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     i->handle.id = id;
     i->w = 0; i->h = 0;
     i->region[0] = 0;

src/nuklear_9slice.c

@@ -10,8 +10,8 @@ NK_API struct nk_nine_slice
 nk_sub9slice_ptr(void *ptr, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     i->handle.ptr = ptr;
     i->w = w; i->h = h;
     i->region[0] = (nk_ushort)rgn.x;
@@ -25,8 +25,8 @@ NK_API struct nk_nine_slice
 nk_sub9slice_id(int id, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     i->handle.id = id;
     i->w = w; i->h = h;
     i->region[0] = (nk_ushort)rgn.x;
@@ -40,8 +40,8 @@ NK_API struct nk_nine_slice
 nk_sub9slice_handle(nk_handle handle, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     i->handle = handle;
     i->w = w; i->h = h;
     i->region[0] = (nk_ushort)rgn.x;
@@ -55,8 +55,8 @@ NK_API struct nk_nine_slice
 nk_nine_slice_handle(nk_handle handle, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     i->handle = handle;
     i->w = 0; i->h = 0;
     i->region[0] = 0;
@@ -70,8 +70,8 @@ NK_API struct nk_nine_slice
 nk_nine_slice_ptr(void *ptr, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     NK_ASSERT(ptr);
     i->handle.ptr = ptr;
     i->w = 0; i->h = 0;
@@ -86,8 +86,8 @@ NK_API struct nk_nine_slice
 nk_nine_slice_id(int id, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b)
 {
     struct nk_nine_slice s;
-    nk_zero(&s, sizeof(s));
     struct nk_image *i = &s.img;
+    nk_zero(&s, sizeof(s));
     i->handle.id = id;
     i->w = 0; i->h = 0;
     i->region[0] = 0;

src/nuklear_draw.c

@@ -418,6 +418,7 @@ NK_API void
 nk_draw_nine_slice(struct nk_command_buffer *b, struct nk_rect r,
     const struct nk_nine_slice *slc, struct nk_color col)
 {
+    struct nk_image img;
     const struct nk_image *slcimg = (const struct nk_image*)slc;
     nk_ushort rgnX, rgnY, rgnW, rgnH;
     rgnX = slcimg->region[0];
@@ -426,8 +427,14 @@ nk_draw_nine_slice(struct nk_command_buffer *b, struct nk_rect r,
     rgnH = slcimg->region[3];
 
     /* top-left */
-    struct nk_image img = {slcimg->handle, slcimg->w, slcimg->h,
-        {rgnX, rgnY, slc->l, slc->t}};
+    img.handle = slcimg->handle;
+    img.w = slcimg->w;
+    img.h = slcimg->h;
+    img.region[0] = rgnX;
+    img.region[1] = rgnY;
+    img.region[2] = slc->l;
+    img.region[3] = slc->t;
+
     nk_draw_image(b,
         nk_rect(r.x, r.y, (float)slc->l, (float)slc->t),
         &img, col);