mkfile # updated with new file names

gif.c  # rewrite of annonymous structs

src/gif.c

@@ -1448,39 +1448,39 @@ static struct nsgif_colour_layout nsgif__bitmap_fmt_to_colour_layout(
 
 	/* Set up colour component order for bitmap format. */
 	switch (bitmap_fmt) {
+		struct nsgif_colour_layout cl;
 	default:
 		/* Fall through. */
 	case NSGIF_BITMAP_FMT_R8G8B8A8:
-		return (struct nsgif_colour_layout) {
-			.r = 0,
-			.g = 1,
-			.b = 2,
-			.a = 3,
-		};
+			cl.r = 0;
+			cl.g = 1;
+			cl.b = 2;
+			cl.a = 3;
+		return cl;
 
 	case NSGIF_BITMAP_FMT_B8G8R8A8:
-		return (struct nsgif_colour_layout) {
-			.b = 0,
-			.g = 1,
-			.r = 2,
-			.a = 3,
-		};
+
+			cl.b = 0;
+			cl.g = 1;
+			cl.r = 2;
+			cl.a = 3;
+		return cl;
 
 	case NSGIF_BITMAP_FMT_A8R8G8B8:
-		return (struct nsgif_colour_layout) {
-			.a = 0,
-			.r = 1,
-			.g = 2,
-			.b = 3,
-		};
+
+			cl.a = 0;
+			cl.r = 1;
+			cl.g = 2;
+			cl.b = 3;
+		return cl;
 
 	case NSGIF_BITMAP_FMT_A8B8G8R8:
-		return (struct nsgif_colour_layout) {
-			.a = 0,
-			.b = 1,
-			.g = 2,
-			.r = 3,
-		};
+
+			cl.a = 0;
+			cl.b = 1;
+			cl.g = 2;
+			cl.r = 3;
+		return cl;
 	}
 }
 

src/mkfile

@@ -1,8 +1,8 @@
 </$objtype/mkfile
 
 LIB=libnsgif.$O.a
-OBJ=libnsgif.$O lzw.$O
-HFILES=../include/libnsgif.h lzw.h utils/log.h 
+OBJ=gif.$O lzw.$O
+HFILES=../include/nsgif.h lzw.h
 
 <../../nsport.mk
 <../../nsportlib.mk