Author: spitzak
Date: 2007-04-10 06:44:19 -0400 (Tue, 10 Apr 2007)
New Revision: 5772
Log:
Header files for png/jpeg moved to their modern Linux locations, which also
removes
the need to special case the local Windows copies.
Modified:
trunk/images/fl_jpeg.cxx
trunk/images/fl_png.cxx
Modified: trunk/images/fl_jpeg.cxx
===================================================================
--- trunk/images/fl_jpeg.cxx 2007-04-10 10:43:15 UTC (rev 5771)
+++ trunk/images/fl_jpeg.cxx 2007-04-10 10:44:19 UTC (rev 5772)
@@ -31,13 +31,7 @@
#if HAVE_LIBJPEG
#include <stdio.h>
-extern "C" {
-# ifdef HAVE_LOCAL_JPEG_H
-# include "libjpeg/jpeglib.h"
-# else
-# include <jpeglib.h>
-# endif
-}
+#include <libjpeg/jpeglib.h>
#include <setjmp.h>
#include <string.h>
Modified: trunk/images/fl_png.cxx
===================================================================
--- trunk/images/fl_png.cxx 2007-04-10 10:43:15 UTC (rev 5771)
+++ trunk/images/fl_png.cxx 2007-04-10 10:44:19 UTC (rev 5772)
@@ -30,13 +30,7 @@
#if HAVE_LIBPNG
-# ifdef HAVE_LOCAL_PNG_H
-# include "libpng/png.h"
-#elif defined(HAVE_PNG_H)
-# include <png.h>
-#elif defined(HAVE_LIBPNG_PNG_H)
-# include <libpng/png.h>
-#endif
+#include <libpng/png.h>
# include <stdlib.h>
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
