diff options
| author | Pedro Giffuni <pfg@apache.org> | 2011-11-09 18:40:47 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2011-11-09 18:40:47 +0000 |
| commit | 72dcda15402d9b23a1ec02c1b626058d2b65d0ef (patch) | |
| tree | aa91ea252b1a22ea57fd9f1294290d68183c213d /shell | |
| parent | cfe6aa70243c19bc00cdbbfbf66358ae5c1848a4 (diff) | |
i118582: OS/2 port - shell fixes. By Yuri Dario
Diffstat (limited to 'shell')
| -rwxr-xr-x | shell/inc/internal/utilities.hxx | 8 | ||||
| -rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index 0094afc93254..6e4aebc3e2ad 100755 --- a/shell/inc/internal/utilities.hxx +++ b/shell/inc/internal/utilities.hxx @@ -40,8 +40,10 @@ #include "internal/types.hxx" #include <string> +#ifndef OS2 #define STRSAFE_NO_DEPRECATE #include <strsafe.h> +#endif //--------------------------------- /** Convert a string to a wstring @@ -90,6 +92,10 @@ std::wstring getShortPathName( const std::wstring& aLongName ); LCID LocaleSetToLCID( const LocaleSet_t & Locale ); #endif +#ifdef OS2 +typedef const char *LPCSTR; +#endif + //---------------------------------------------------------- #ifdef DEBUG inline void OutputDebugStringFormat( LPCSTR pFormat, ... ) @@ -97,9 +103,11 @@ inline void OutputDebugStringFormat( LPCSTR pFormat, ... ) CHAR buffer[1024]; va_list args; +#ifndef OS2 va_start( args, pFormat ); StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args ); OutputDebugStringA( buffer ); +#endif } #else static inline void OutputDebugStringFormat( LPCSTR, ... ) diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 94ac3960beb8..0c4bc70135d0 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -44,6 +44,9 @@ #include <string.h> #include <errno.h> #include <unistd.h> +#ifdef OS2 +#include <process.h> +#endif //------------------------------------------------------------------------ // namespace directives |