mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pyuno: fix breakage because PATH_MAX not defined with Python3

Browse Source 
Change-Id: I12e55c8810193591d9cd017bf5d89078b3915ddb
This commit is contained in:
Michael Stahl
2012-11-16 15:30:26 +01:00
parent e60f936ece
commit 8e5ea6dcbf
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pyuno/source/loader/pyuno_loader.cxx
View File

@@ -30,6 +30,19 @@
#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
// apparently PATH_MAX is not standard and not defined by MSVC
#ifndef PATH_MAX
#ifdef _MAX_PATH
#define PATH_MAX _MAX_PATH
#else
#ifdef MAX_PATH
#define PATH_MAX MAX_PATH
#else
#error no PATH_MAX
#endif
#endif
#endif
using rtl::OUString; using rtl::OUString;
using rtl::OUStringBuffer; using rtl::OUStringBuffer;
using rtl::OString; using rtl::OString;
@@ -111,7 +124,6 @@ static void setPythonHome ( const OUString & pythonHome )
OString o = rtl::OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() ); OString o = rtl::OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() );
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
// static because Py_SetPythonHome just copies the "wide" pointer // static because Py_SetPythonHome just copies the "wide" pointer
// PATH_MAX is defined in Python.h
static wchar_t wide[PATH_MAX + 1]; static wchar_t wide[PATH_MAX + 1];
size_t len = mbstowcs(wide, o.pData->buffer, PATH_MAX + 1); size_t len = mbstowcs(wide, o.pData->buffer, PATH_MAX + 1);
if(len == (size_t)-1) if(len == (size_t)-1)