From 870e4549f9aeab8ebe8d3a703dbdfb10c386d9fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Sat, 6 Mar 2010 16:18:16 +0000 Subject: [PATCH] cmake: fix merge build git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33645 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Buffer.cpp | 2 +- src/BufferParams.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index a7d19dc303..4214e31384 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -1308,7 +1308,7 @@ void Buffer::writeLaTeXSource(odocstream & os, if (!original_path.empty()) { // FIXME UNICODE // We don't know the encoding of inputpath - docstring const inputpath = from_utf8(latex_path(original_path)); + docstring const inputpath = from_utf8(support::latex_path(original_path)); docstring uncodable_glyphs; Encoding const * const enc = runparams.encoding; if (enc) { diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 06bd898b5f..9a64ec6cf5 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -1280,7 +1280,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, incfile = mangled; // \includeonly doesn't want an extension incfile = changeExtension(incfile, string()); - incfile = latex_path(incfile); + incfile = support::latex_path(incfile); if (!incfile.empty()) { if (!first) os << ","; -- 2.39.2