summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2011-04-04 13:20:41 +0200
committerIvo Hinkelmann <ihi@openoffice.org>2011-04-04 13:20:41 +0200
commit9e84958536c737f8fdcff4d28664d0c13b9cdc8c (patch)
tree5f18fa04d5d600240a1641c3d7f356eedaddd6ed
parent29ce0e46f01240022c09e72dde229641fd5acc56 (diff)
parent0fb5462f69e7b5e44ac8abb1cba1a2115676494f (diff)
masterfix DEV300: #i10000# fixed includes
Notes
split repo tag: libs-gui_ooo/DEV300_m106
-rw-r--r--svtools/Library_svt.mk1
-rw-r--r--svtools/source/filter/jpeg/jpeg.cxx4
2 files changed, 3 insertions, 2 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index f1c5dfef1590..c7dab0f17746 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/pr
$(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
$(eval $(call gb_Library_set_include,svt,\
+ -I$(OUTDIR)/inc/external/jpeg \
$$(INCLUDE) \
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
diff --git a/svtools/source/filter/jpeg/jpeg.cxx b/svtools/source/filter/jpeg/jpeg.cxx
index 6f157a248ddc..2f43b1b025f3 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 "jpeg/jpeglib.h"
- #include "jpeg/jerror.h"
+ #include "jpeglib.h"
+ #include "jerror.h"
}
#define _JPEGPRIVATE