diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-30 18:52:07 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-30 18:52:07 +0200 |
| commit | d2f6b45b7bbee300177b0cd71399ede22bc1d4f9 (patch) | |
| tree | 10b3fc74cf37e00044aa409253bf4b70d2600efb /svtools | |
| parent | masterfix DEV300: #i10000# removeing moved code (diff) | |
| download | core-d2f6b45b7bbee300177b0cd71399ede22bc1d4f9.tar.gz core-d2f6b45b7bbee300177b0cd71399ede22bc1d4f9.zip | |
masterfix DEV300: #i10000# build fixes
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/Library_svt.mk | 1 | ||||
| -rw-r--r-- | svtools/source/filter/jpeg/jpeg.cxx | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 39b135f16b1e..f1c5dfef1590 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_set_include,svt,\ -I$(SRCDIR)/svtools/source/inc \ -I$(SRCDIR)/svtools/inc/pch \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ )) $(eval $(call gb_Library_set_defs,svt,\ diff --git a/svtools/source/filter/jpeg/jpeg.cxx b/svtools/source/filter/jpeg/jpeg.cxx index dff6ec8ff51f..6f157a248ddc 100644 --- a/svtools/source/filter/jpeg/jpeg.cxx +++ b/svtools/source/filter/jpeg/jpeg.cxx @@ -34,8 +34,8 @@ extern "C" { #include "stdio.h" #include "jpeg.h" - #include "jpeglib.h" - #include "jerror.h" + #include "jpeg/jpeglib.h" + #include "jpeg/jerror.h" } #define _JPEGPRIVATE @@ -112,7 +112,7 @@ extern "C" void init_destination (j_compress_ptr cinfo) dest->pub.free_in_buffer = BUF_SIZE; } -extern "C" int empty_output_buffer (j_compress_ptr cinfo) +extern "C" boolean empty_output_buffer (j_compress_ptr cinfo) { my_dest_ptr dest = (my_dest_ptr) cinfo->dest; @@ -217,7 +217,7 @@ long StreamRead( SvStream* pSvStm, void* pBuffer, long nBufferSize ) return nRead; } -extern "C" int fill_input_buffer (j_decompress_ptr cinfo) +extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo) { my_src_ptr src = (my_src_ptr) cinfo->src; size_t nbytes; |