* Fix nameclash of <png.h> with lib/ivis_common/png.h

* renamed lib/ivis_common/png.[ch] to lib/ivis_common/png_util.[ch]

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1562 4a71c877-e1ca-e34f-864e-861f7616d084

lib/ivis_common/Makefile.am

@@ -1,9 +1,9 @@
 noinst_LIBRARIES = libivis_common.a
 noinst_HEADERS = bitimage.h imd.h ivi.h ivisdef.h \
 	ivispatch.h pieblitfunc.h pieclip.h piedef.h piefunc.h piemode.h piepalette.h \
-	piestate.h pietypes.h png.h rendfunc.h rendmode.h tex.h textdraw.h
+	piestate.h pietypes.h png_util.h rendfunc.h rendmode.h tex.h textdraw.h
 
-libivis_common_a_SOURCES = bitimage.c imd.c imdload.c png.c pieclip.c \
+libivis_common_a_SOURCES = bitimage.c imd.c imdload.c png_util.c pieclip.c \
 	piestate.c
 
 libivis_common_a_LIBADD = $(top_builddir)/lib/framework/libframework.a

lib/ivis_common/Makefile.raw

@@ -6,7 +6,7 @@ SRC=bitimage.c \
 	imdload.c \
 	pieclip.c \
 	piestate.c \
-	png.c
+	png_util.c
 
 LIB=ivis_common
 

lib/ivis_common/png_util.c

@@ -20,7 +20,7 @@
 
 #include "lib/framework/frame.h"
 
-#include "png.h"
+#include "png_util.h"
 #ifdef WZ_OS_MAC
 #include <Png/png.h>
 #else

lib/ivis_opengl/screen.c

@@ -30,7 +30,7 @@
 #include <SDL/SDL_opengl.h>
 #include <physfs.h>
 #include <png.h>
-#include "lib/ivis_common/png.h"
+#include "lib/ivis_common/png_util.h"
 
 #include "lib/framework/frameint.h"
 #include "lib/ivis_common/piestate.h"

lib/ivis_opengl/tex.c

@@ -32,7 +32,7 @@
 #include "lib/ivis_common/rendmode.h"
 #include "lib/ivis_common/piepalette.h"
 #include "lib/ivis_common/ivispatch.h"
-#include "lib/ivis_common/png.h"
+#include "lib/ivis_common/png_util.h"
 
 #include "screen.h"
 

po/POTFILES.in

@@ -21,7 +21,7 @@ lib/ivis_common/imd.c
 lib/ivis_common/pieclip.c
 lib/ivis_common/bitimage.c
 lib/ivis_common/piestate.c
-lib/ivis_common/png.c
+lib/ivis_common/png_util.c
 lib/gamelib/hashtabl.c
 lib/gamelib/anim.c
 lib/gamelib/gtime.c

src/data.c

@@ -62,7 +62,7 @@
 #include "display3d.h"
 #include "display3ddef.h"
 #include "init.h"
-#include "lib/ivis_common/png.h"
+#include "lib/ivis_common/png_util.h"
 
 #include "multiplay.h"
 #include "lib/netplay/netplay.h"