[GRASS-CVS] markus: grass6/raster/r.out.png pngfunc.h,2.2,2.2.6.1

grass at intevation.de grass at intevation.de
Sun Nov 18 14:57:05 EST 2007


Author: markus

Update of /grassrepository/grass6/raster/r.out.png
In directory doto:/tmp/cvs-serv23112

Modified Files:
      Tag: releasebranch_6_3
	pngfunc.h 
Log Message:
Remove cruft from headers (merge from HEAD)

Index: pngfunc.h
===================================================================
RCS file: /grassrepository/grass6/raster/r.out.png/pngfunc.h,v
retrieving revision 2.2
retrieving revision 2.2.6.1
diff -u -d -r2.2 -r2.2.6.1
--- pngfunc.h	9 Feb 2006 03:09:02 -0000	2.2
+++ pngfunc.h	18 Nov 2007 19:57:03 -0000	2.2.6.1
@@ -6,14 +6,6 @@
   jmp_buf jmpbuf;
 } jmpbuf_wrapper;
 
-/* GRR 19991205:  this is used as a test for pre-1999 versions of netpbm and
- *   pbmplus vs. 1999 or later (in which pm_close was split into two) 
- */
-#ifdef PBMPLUS_RAWBITS
-#  define pm_closer pm_close
-#  define pm_closew pm_close
-#endif
-
 #ifndef TRUE
 #  define TRUE 1
 #endif
@@ -27,9 +19,7 @@
 #define MAXCOMMENTS 256
 
 /* function prototypes */
-#ifdef __STDC__
 static void pnmtopng_error_handler (png_structp png_ptr, png_const_charp msg);
-#endif
 
 #if 0
 /* unused */




More information about the grass-commit mailing list