Deleted header.c (in the end not really useful or needed)

src/Makefile

@@ -313,7 +313,7 @@ META_OBJS=meta/adx_header.o \
 
 EXT_LIBS = ../ext_libs/clHCA.o
 
-OBJECTS=vgmstream.o streamfile.o util.o header.o formats.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS) $(EXT_LIBS)
+OBJECTS=vgmstream.o streamfile.o util.o formats.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS) $(EXT_LIBS)
 
 libvgmstream.a: $(OBJECTS)
 	$(AR) crs libvgmstream.a $(OBJECTS)

src/Makefile.unix.am

@@ -4,8 +4,8 @@ AM_CFLAGS = -Wall @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)
 AM_MAKEFLAGS=-f Makefile.unix
 
 libvgmstream_la_LDFLAGS = coding/libcoding.la layout/liblayout.la meta/libmeta.la
-libvgmstream_la_SOURCES = vgmstream.c util.c streamfile.c header.c formats.c ../ext_libs/clHCA.c
+libvgmstream_la_SOURCES = vgmstream.c util.c streamfile.c formats.c ../ext_libs/clHCA.c
 
 SUBDIRS = coding layout meta
 
-EXTRA_DIST = pstdint.h streamfile.h streamtypes.h util.h header.h vgmstream.h
+EXTRA_DIST = pstdint.h streamfile.h streamtypes.h util.h vgmstream.h

src/header.c

@@ -1,7 +0,0 @@
-#include <string.h>
-#include "header.h"
-#include "vgmstream.h"
-#include "streamfile.h"
-#include "streamtypes.h"
-#include "util.h"
-

src/header.h

@@ -1,14 +0,0 @@
-/*
- * header.h - utilities for common/repetitive actions in stream headers (more complex than those in util.h)
- */
-
-#ifndef _HEADER_H_
-#define _HEADER_H_
-
-#include "util.h"
-#include "streamfile.h"
-#include "vgmstream.h"
-
-
-
-#endif /* _HEADER_H_ */

src/libvgmstream.vcproj

@@ -150,10 +150,6 @@
             <File
                 RelativePath=".\formats.h"
                 >
-            </File>
-            <File
-                RelativePath=".\header.h"
-                >
             </File>
 			<File
 				RelativePath=".\streamfile.h"
@@ -180,10 +176,6 @@
             <File
                 RelativePath=".\formats.c"
                 >
-            </File>
-            <File
-                RelativePath=".\header.c"
-                >
             </File>
 			<File
 				RelativePath=".\streamfile.c"

src/libvgmstream.vcxproj

@@ -83,7 +83,6 @@
   <ItemGroup>
     <ClInclude Include="..\ext_includes\clHCA.h" />
     <ClInclude Include="formats.h" />
-    <ClInclude Include="header.h" />
     <ClInclude Include="streamfile.h" />
     <ClInclude Include="streamtypes.h" />
     <ClInclude Include="util.h" />
@@ -142,7 +141,6 @@
     <ClCompile Include="meta\x360.c" />
     <ClCompile Include="meta\x360_tra.c" />
     <ClCompile Include="formats.c" />
-    <ClCompile Include="header.c" />
     <ClCompile Include="streamfile.c" />
     <ClCompile Include="util.c" />
     <ClCompile Include="vgmstream.c" />

src/libvgmstream.vcxproj.filters

@@ -50,9 +50,6 @@
     <ClInclude Include="formats.h">
       <Filter>Header Files</Filter>
     </ClInclude>  
-    <ClInclude Include="header.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="streamfile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -91,9 +88,6 @@
     <ClCompile Include="formats.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="header.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="streamfile.c">
       <Filter>Source Files</Filter>
     </ClCompile>