From c44253fa0cdd4acd2df948ce3d0772827a01dd77 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sat, 13 Mar 2010 20:58:39 -0600
Subject: [PATCH] [devel] Fixed indentation in pngconf.h

Removed scripting cruft from scripts/makefile.mingw
Removed mention of now nonexistent files from scripts/README.txt
---
 pngconf.h              | 31 +++++++++++++------------------
 scripts/README.txt     |  2 --
 scripts/makefile.mingw |  2 +-
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/pngconf.h b/pngconf.h
index 644f2603e..72d690097 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -387,9 +387,9 @@
  */
 
 #ifndef PNG_NO_PEDANTIC_WARNINGS
-#ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
-#  define PNG_PEDANTIC_WARNINGS_SUPPORTED
-#endif
+#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
+#    define PNG_PEDANTIC_WARNINGS_SUPPORTED
+#  endif
 #endif
 
 #ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
@@ -633,11 +633,6 @@
 #    ifndef PNG_NO_READ_INVERT
 #      define PNG_READ_INVERT_SUPPORTED
 #    endif
-#    if 0 /* removed from libpng-1.4.0 */
-#      ifndef PNG_NO_READ_DITHER
-#        define PNG_READ_DITHER_SUPPORTED
-#      endif
-#    endif /* 0 */
 #    ifndef PNG_NO_READ_BACKGROUND
 #      define PNG_READ_BACKGROUND_SUPPORTED
 #    endif
@@ -683,8 +678,8 @@
 
 /* PNG_NO_SEQUENTIAL_READ_SUPPORTED is deprecated. */
 #  if !defined(PNG_NO_SEQUENTIAL_READ) && \
-    !defined(PNG_SEQUENTIAL_READ_SUPPORTED) && \
-    !defined(PNG_NO_SEQUENTIAL_READ_SUPPORTED)
+      !defined(PNG_SEQUENTIAL_READ_SUPPORTED) && \
+      !defined(PNG_NO_SEQUENTIAL_READ_SUPPORTED)
 #    define PNG_SEQUENTIAL_READ_SUPPORTED
 #  endif
 
@@ -696,7 +691,7 @@
 #  endif
 
 #  if !defined(PNG_NO_GET_INT_32) || defined(PNG_READ_oFFS_SUPPORTED) || \
-    defined(PNG_READ_pCAL_SUPPORTED)
+      defined(PNG_READ_pCAL_SUPPORTED)
 #    ifndef PNG_GET_INT_32_SUPPORTED
 #      define PNG_GET_INT_32_SUPPORTED
 #    endif
@@ -869,7 +864,7 @@
 #  define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d
 #endif
 #ifndef PNG_STRING_NEWLINE
-#define PNG_STRING_NEWLINE "\n"
+#  define PNG_STRING_NEWLINE "\n"
 #endif
 
 /* These are currently experimental features, define them if you want */
@@ -1209,7 +1204,7 @@
 
 /* Need the time information for converting tIME chunks */
 #ifdef PNG_CONVERT_tIME_SUPPORTED
-   /* "time.h" functions are not supported on WindowsCE */
+  /* "time.h" functions are not supported on WindowsCE */
 #  include <time.h>
 #endif
 
@@ -1266,11 +1261,11 @@ typedef unsigned char png_byte;
 #      endif
 #      define USE_FAR_KEYWORD
 #    endif   /* LDATA != 1 */
-     /* Possibly useful for moving data out of default segment.
-      * Uncomment it if you want. Could also define FARDATA as
-      * const if your compiler supports it. (SJT)
+         /* Possibly useful for moving data out of default segment.
+          * Uncomment it if you want. Could also define FARDATA as
+          * const if your compiler supports it. (SJT)
 #        define FARDATA FAR
-      */
+          */
 #  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
 #endif   /* __BORLANDC__ */
 
@@ -1345,7 +1340,7 @@ typedef char            FAR * FAR * FAR * png_charppp;
  * functions that are passed far data must be model-independent.
  */
 
-/* memory model/platform independent fns */
+/* Memory model/platform independent fns */
 #ifndef PNG_ABORT
 #  ifdef _WINDOWS_
 #    define PNG_ABORT() ExitProcess(0)
diff --git a/scripts/README.txt b/scripts/README.txt
index 1d4e8d581..74d28cadc 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -15,7 +15,6 @@ Makefiles for  libpng version 1.5.0beta14 - March 14, 2010
  makefile.beos     =>  beos makefile
  makefile.bor      =>  Borland makefile (uses bcc)
  makefile.cegcc    =>  minge32ce for Windows CE makefile
- makefile.cygwin   =>  Cygwin/gcc makefile
  makefile.darwin   =>  Darwin makefile, can use on MacosX
  makefile.dec      =>  DEC Alpha UNIX makefile
  makefile.dj2      =>  DJGPP 2 makefile
@@ -58,7 +57,6 @@ Other supporting scripts:
  libpng-config-body.in => used by several makefiles to create libpng-config
  libpng-config-head.in => used by several makefiles to create libpng-config
  libpng.pc.in      =>  Used by several makefiles to create libpng.pc
- pngwin.def        =>  Module definitions for makefile.cygwin and mingw
  pngwin.rc         =>  Used by the visualc6 and visualc71 projects.
  SCOPTIONS.ppc     =>  Used with smakefile.ppc
 
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index b22a18c6c..f64df51b6 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -153,7 +153,7 @@ $(STATLIB): $(OBJS)
 	$(AR) rc $@ $(OBJS)
 	$(RANLIB) $@
 
-%14_%$(SHAREDDEF): libpng.def
+$(SHAREDDEF): libpng.def
 	cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
 	sed -e 's/\([^;]*\);/;/' > $@
 
-- 
GitLab