Revert "Run Nindent on com32/include/pngconf.h"

This reverts commit 6361b71f87466877f8fd1273240e8fa4460f8d05.

<pngconf.h> is part of libpng, it should never have been Nindented.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/com32/include/pngconf.h b/com32/include/pngconf.h
index bc28b9e..3ac628c 100644 (file)
--- a/com32/include/pngconf.h
+++ b/com32/include/pngconf.h
@@ -253,7 +253,7 @@
  */
 #ifndef PNGARG
 
-#ifdef OF                      /* zlib prototype munger */
+#ifdef OF /* zlib prototype munger */
 #  define PNGARG(arglist) OF(arglist)
 #else
 
@@ -304,8 +304,8 @@
      /* If you encounter a compiler error here, see the explanation
       * near the end of INSTALL.
       */
-__png.h__ already includes setjmp.h;
-__dont__ include it again.;
+         __png.h__ already includes setjmp.h;
+         __dont__ include it again.;
 #    endif
 #  endif /* __linux__ */
 
@@ -572,16 +572,16 @@ __dont__ include it again.;
 #endif /* PNG_READ_TRANSFORMS_SUPPORTED */
 
 #if !defined(PNG_NO_PROGRESSIVE_READ) && \
- !defined(PNG_PROGRESSIVE_READ_NOT_SUPPORTED)  /* if you don't do progressive */
-#  define PNG_PROGRESSIVE_READ_SUPPORTED       /* reading.  This is not talking */
-#endif /* about interlacing capability!  You'll */
-             /* still have interlacing unless you change the following line: */
+ !defined(PNG_PROGRESSIVE_READ_NOT_SUPPORTED)  /* if you don't do progressive */
+#  define PNG_PROGRESSIVE_READ_SUPPORTED     /* reading.  This is not talking */
+#endif                               /* about interlacing capability!  You'll */
+              /* still have interlacing unless you change the following line: */
 
-#define PNG_READ_INTERLACING_SUPPORTED /* required for PNG-compliant decoders */
+#define PNG_READ_INTERLACING_SUPPORTED /* required for PNG-compliant decoders */
 
 #ifndef PNG_NO_READ_COMPOSITE_NODIV
-#  ifndef PNG_NO_READ_COMPOSITED_NODIV /* libpng-1.0.x misspelling */
-#    define PNG_READ_COMPOSITE_NODIV_SUPPORTED /* well tested on Intel, SGI */
+#  ifndef PNG_NO_READ_COMPOSITED_NODIV  /* libpng-1.0.x misspelling */
+#    define PNG_READ_COMPOSITE_NODIV_SUPPORTED   /* well tested on Intel, SGI */
 #  endif
 #endif
 
@@ -620,7 +620,7 @@ __dont__ include it again.;
 #    define PNG_WRITE_INVERT_SUPPORTED
 #  endif
 #  ifndef PNG_NO_WRITE_FILLER
-#    define PNG_WRITE_FILLER_SUPPORTED /* same as WRITE_STRIP_ALPHA */
+#    define PNG_WRITE_FILLER_SUPPORTED   /* same as WRITE_STRIP_ALPHA */
 #  endif
 #  ifndef PNG_NO_WRITE_SWAP_ALPHA
 #    define PNG_WRITE_SWAP_ALPHA_SUPPORTED
@@ -633,9 +633,9 @@ __dont__ include it again.;
 #  endif
 #endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
 
-#define PNG_WRITE_INTERLACING_SUPPORTED        /* not required for PNG-compliant
-                                          encoders, but can cause trouble
-                                          if left undefined */
+#define PNG_WRITE_INTERLACING_SUPPORTED  /* not required for PNG-compliant
+                                            encoders, but can cause trouble
+                                            if left undefined */
 
 #if !defined(PNG_NO_WRITE_WEIGHTED_FILTER) && \
      defined(PNG_FLOATING_POINT_SUPPORTED)
@@ -880,8 +880,8 @@ __dont__ include it again.;
 #  endif
 #endif
 #ifndef PNG_NO_READ_OPT_PLTE
-#  define PNG_READ_OPT_PLTE_SUPPORTED  /* only affects support of the */
-#endif /* optional PLTE chunk in RGB and RGBA images */
+#  define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the */
+#endif                      /* optional PLTE chunk in RGB and RGBA images */
 #if defined(PNG_READ_iTXt_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) || \
     defined(PNG_READ_zTXt_SUPPORTED)
 #  define PNG_READ_TEXT_SUPPORTED
@@ -1056,10 +1056,10 @@ typedef unsigned char png_byte;
 /* This is usually size_t.  It is typedef'ed just in case you need it to
    change (I'm not sure if you will or not, so I thought I'd be safe) */
 #ifdef PNG_SIZE_T
-typedef PNG_SIZE_T png_size_t;
+   typedef PNG_SIZE_T png_size_t;
 #  define png_sizeof(x) png_convert_size(sizeof (x))
 #else
-typedef size_t png_size_t;
+   typedef size_t png_size_t;
 #  define png_sizeof(x) sizeof (x)
 #endif
 
@@ -1088,14 +1088,15 @@ typedef size_t png_size_t;
 #        define FAR __far
 #      endif
 #      define USE_FAR_KEYWORD
-#    endif /* LDATA != 1 */
+#    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)
-      #    define FARDATA FAR
+#    define FARDATA FAR
       */
-#  endif /* __WIN32__, __FLAT__, __CYGWIN__ */
-#endif /* __BORLANDC__ */
+#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
+#endif   /* __BORLANDC__ */
+
 
 /* Suggest testing for specific compiler first before testing for
  * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
@@ -1126,43 +1127,43 @@ typedef size_t png_size_t;
 typedef png_int_32 png_fixed_point;
 
 /* Add typedefs for pointers */
-typedef void FAR *png_voidp;
-typedef png_byte FAR *png_bytep;
-typedef png_uint_32 FAR *png_uint_32p;
-typedef png_int_32 FAR *png_int_32p;
-typedef png_uint_16 FAR *png_uint_16p;
-typedef png_int_16 FAR *png_int_16p;
-typedef PNG_CONST char FAR *png_const_charp;
-typedef char FAR *png_charp;
-typedef png_fixed_point FAR *png_fixed_point_p;
+typedef void            FAR * png_voidp;
+typedef png_byte        FAR * png_bytep;
+typedef png_uint_32     FAR * png_uint_32p;
+typedef png_int_32      FAR * png_int_32p;
+typedef png_uint_16     FAR * png_uint_16p;
+typedef png_int_16      FAR * png_int_16p;
+typedef PNG_CONST char  FAR * png_const_charp;
+typedef char            FAR * png_charp;
+typedef png_fixed_point FAR * png_fixed_point_p;
 
 #ifndef PNG_NO_STDIO
 #if defined(_WIN32_WCE)
-typedef HANDLE png_FILE_p;
+typedef HANDLE                png_FILE_p;
 #else
-typedef FILE *png_FILE_p;
+typedef FILE                * png_FILE_p;
 #endif
 #endif
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double FAR *png_doublep;
+typedef double          FAR * png_doublep;
 #endif
 
 /* Pointers to pointers; i.e. arrays */
-typedef png_byte FAR *FAR * png_bytepp;
-typedef png_uint_32 FAR *FAR * png_uint_32pp;
-typedef png_int_32 FAR *FAR * png_int_32pp;
-typedef png_uint_16 FAR *FAR * png_uint_16pp;
-typedef png_int_16 FAR *FAR * png_int_16pp;
-typedef PNG_CONST char FAR *FAR * png_const_charpp;
-typedef char FAR *FAR * png_charpp;
-typedef png_fixed_point FAR *FAR * png_fixed_point_pp;
+typedef png_byte        FAR * FAR * png_bytepp;
+typedef png_uint_32     FAR * FAR * png_uint_32pp;
+typedef png_int_32      FAR * FAR * png_int_32pp;
+typedef png_uint_16     FAR * FAR * png_uint_16pp;
+typedef png_int_16      FAR * FAR * png_int_16pp;
+typedef PNG_CONST char  FAR * FAR * png_const_charpp;
+typedef char            FAR * FAR * png_charpp;
+typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double FAR *FAR * png_doublepp;
+typedef double          FAR * FAR * png_doublepp;
 #endif
 
 /* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char FAR *FAR * FAR * png_charppp;
+typedef char            FAR * FAR * FAR * png_charppp;
 
 #if defined(PNG_1_0_X) || defined(PNG_1_2_X)
 /* SPC -  Is this stuff deprecated? */
@@ -1171,9 +1172,9 @@ typedef char FAR *FAR * FAR * png_charppp;
  * or another compression library is used, then change these.
  * Eliminates need to change all the source files.
  */
-typedef charf *png_zcharp;
-typedef charf *FAR * png_zcharpp;
-typedef z_stream FAR *png_zstreamp;
+typedef charf *         png_zcharp;
+typedef charf * FAR *   png_zcharpp;
+typedef z_stream FAR *  png_zstreamp;
 #endif /* (PNG_1_0_X) || defined(PNG_1_2_X) */
 
 /*
@@ -1288,10 +1289,10 @@ typedef z_stream FAR *png_zstreamp;
 #           if defined(PNG_BUILD_DLL)
 #              define PNG_IMPEXP __export
 #           else
-#              define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in
-                                                  VC++ */
-#           endif /* Exists in Borland C++ for
-                    C++ classes (== huge) */
+#              define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in
+                                                 VC++ */
+#           endif                             /* Exists in Borland C++ for
+                                                 C++ classes (== huge) */
 #        endif
 #     endif
 
@@ -1302,14 +1303,14 @@ typedef z_stream FAR *png_zstreamp;
 #           define PNG_IMPEXP __declspec(dllimport)
 #        endif
 #     endif
-#  endif /* PNG_IMPEXP */
+#  endif  /* PNG_IMPEXP */
 #else /* !(DLL || non-cygwin WINDOWS) */
 #   if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
 #      ifndef PNGAPI
 #         define PNGAPI _System
 #      endif
 #   else
-#      if 0                    /* ... other platforms, with other meanings */
+#      if 0 /* ... other platforms, with other meanings */
 #      endif
 #   endif
 #endif
@@ -1357,25 +1358,25 @@ typedef z_stream FAR *png_zstreamp;
    (LIBPNG_WAS_COMPILED_WITH__PNG_SETJMP_NOT_SUPPORTED)
 #endif
 
-#if defined(USE_FAR_KEYWORD)   /* memory model independent fns */
+#if defined(USE_FAR_KEYWORD)  /* memory model independent fns */
 /* use this to make far-to-near assignments */
 #  define CHECK   1
 #  define NOCHECK 0
 #  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
 #  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
 #  define png_strcpy  _fstrcpy
-#  define png_strncpy _fstrncpy        /* Added to v 1.2.6 */
+#  define png_strncpy _fstrncpy   /* Added to v 1.2.6 */
 #  define png_strlen  _fstrlen
-#  define png_memcmp  _fmemcmp /* SJT: added */
+#  define png_memcmp  _fmemcmp    /* SJT: added */
 #  define png_memcpy  _fmemcpy
 #  define png_memset  _fmemset
 #else /* use the usual functions */
 #  define CVT_PTR(ptr)         (ptr)
 #  define CVT_PTR_NOCHECK(ptr) (ptr)
 #  define png_strcpy  strcpy
-#  define png_strncpy strncpy  /* Added to v 1.2.6 */
+#  define png_strncpy strncpy     /* Added to v 1.2.6 */
 #  define png_strlen  strlen
-#  define png_memcmp  memcmp   /* SJT: added */
+#  define png_memcmp  memcmp      /* SJT: added */
 #  define png_memcpy  memcpy
 #  define png_memset  memset
 #endif
@@ -1400,10 +1401,10 @@ typedef z_stream FAR *png_zstreamp;
  */
 
 #ifndef PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT
-#  define PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT  128      /*  >=  */
+#  define PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT  128  /*  >=  */
 #endif
 #ifndef PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT
-#  define PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT  9        /*  >=  */
+#  define PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT  9    /*  >=  */
 #endif
 
 /* Set this in the makefile for VC++ on Pentium, not here. */