diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2009-04-16 17:41:41 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2009-04-16 17:41:41 +0000 |
commit | 07967600763079a4cd1512abd7f3d9207993d8f7 (patch) | |
tree | 4efc2341eab64e92415e38a8a49c08c913cd4ea8 /Build/source/texk/web2c | |
parent | 7ebb7368fa53009acc87aaa8211fabee5608265b (diff) |
remove the image.h trick that forced a local png.h
git-svn-id: svn://tug.org/texlive/trunk@12735 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/image/image.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 4091aff8cdb..d1290d11cd0 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,5 +1,9 @@ 2009-04-16 Taco Hoekwater <taco@luatex.org> + * image/image.h: remove the trick that forced a local png.h + +2009-04-16 Taco Hoekwater <taco@luatex.org> + * luatexdir: import of the current state of luatex, 0.39.0. This affects many files in subdirectories. diff --git a/Build/source/texk/web2c/luatexdir/image/image.h b/Build/source/texk/web2c/luatexdir/image/image.h index 7d9bb8b0e00..d619a2f585d 100644 --- a/Build/source/texk/web2c/luatexdir/image/image.h +++ b/Build/source/texk/web2c/luatexdir/image/image.h @@ -18,12 +18,12 @@ You should have received a copy of the GNU General Public License along with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */ -/* $Id: image.h 1407 2008-07-15 10:49:28Z taco $ */ +/* $Id: image.h 2307 2009-04-16 17:37:31Z taco $ */ #ifndef IMAGE_H # define IMAGE_H -# include <../libpng/png.h> +# include <png.h> # define JPG_UINT16 unsigned int # define JPG_UINT32 unsigned long |