diff options
| author | Matěj Týč <bubla@users.sourceforge.net> | 2008-12-19 17:29:36 +0000 |
|---|---|---|
| committer | Matěj Týč <bubla@users.sourceforge.net> | 2008-12-19 17:29:36 +0000 |
| commit | d8e323018d6380927301afbaa08a88a504310a20 (patch) | |
| tree | 01e68834e54a3f1b8ed4fb22909a7fe1fa32f15f /DevIL/examples | |
| parent | a998962966e1630137ca81e85a5f3e32797dc9ed (diff) | |
| download | devil-d8e323018d6380927301afbaa08a88a504310a20.tar.gz | |
distcheck enhancement and removal of ILvoid from the rest
Diffstat (limited to 'DevIL/examples')
| -rw-r--r-- | DevIL/examples/Makefile.am | 5 | ||||
| -rw-r--r-- | DevIL/examples/override_example/iotest.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/DevIL/examples/Makefile.am b/DevIL/examples/Makefile.am index 6d94c2a2..248e46ed 100644 --- a/DevIL/examples/Makefile.am +++ b/DevIL/examples/Makefile.am @@ -1,8 +1,9 @@ -AM_CPPFLAGS = -I ../include/ - +all_include = $(srcdir)/../include devildir = @datadir@/devil examplesdir = $(devildir)/examples +AM_CPPFLAGS = -I $(all_include) + if BUILD_MONOLITHIC #il_library = ../lib/libDevIL.la # just not needed now ilu_library = ../lib/libDevIL.la diff --git a/DevIL/examples/override_example/iotest.c b/DevIL/examples/override_example/iotest.c index 16f0e18a..0db8f162 100644 --- a/DevIL/examples/override_example/iotest.c +++ b/DevIL/examples/override_example/iotest.c @@ -23,7 +23,7 @@ ILHANDLE ILAPIENTRY iOpenRead(const char *FileName) return (ILHANDLE)fopen(FileName, "rb"); } -ILvoid ILAPIENTRY iCloseRead(ILHANDLE Handle) +void ILAPIENTRY iCloseRead(ILHANDLE Handle) { fclose((FILE*)Handle); return; @@ -34,7 +34,7 @@ ILHANDLE ILAPIENTRY iOpenWrite(const char *FileName) return (ILHANDLE)fopen(FileName, "wb"); } -ILvoid ILAPIENTRY iCloseWrite(ILHANDLE Handle) +void ILAPIENTRY iCloseWrite(ILHANDLE Handle) { fclose((FILE*)Handle); return; @@ -55,12 +55,12 @@ ILint ILAPIENTRY iPutc(ILubyte Char, ILHANDLE Handle) return fputc(Char, (FILE*)Handle); } -ILint ILAPIENTRY iRead(ILvoid *Buffer, ILuint Size, ILuint Number, ILHANDLE Handle) +ILint ILAPIENTRY iRead(void *Buffer, ILuint Size, ILuint Number, ILHANDLE Handle) { return fread(Buffer, Size, Number, (FILE*)Handle); } -ILint ILAPIENTRY iWrite(const ILvoid *Buffer, ILuint Size, ILuint Number, ILHANDLE Handle) +ILint ILAPIENTRY iWrite(const void *Buffer, ILuint Size, ILuint Number, ILHANDLE Handle) { return fwrite(Buffer, Size, Number, (FILE*)Handle); } |