incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1199930 - in /incubator/ooo/trunk/main/shell: inc/internal/utilities.hxx source/unix/exec/shellexec.cxx
Date Wed, 09 Nov 2011 19:40:48 GMT
Author: pfg
Date: Wed Nov  9 19:40:47 2011
New Revision: 1199930

URL: http://svn.apache.org/viewvc?rev=1199930&view=rev
Log:
i118582: OS/2 port - shell fixes. By Yuri Dario

Modified:
    incubator/ooo/trunk/main/shell/inc/internal/utilities.hxx
    incubator/ooo/trunk/main/shell/source/unix/exec/shellexec.cxx

Modified: incubator/ooo/trunk/main/shell/inc/internal/utilities.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/shell/inc/internal/utilities.hxx?rev=1199930&r1=1199929&r2=1199930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/shell/inc/internal/utilities.hxx (original)
+++ incubator/ooo/trunk/main/shell/inc/internal/utilities.hxx Wed Nov  9 19:40:47 2011
@@ -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
 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( LPC
 	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, ... )

Modified: incubator/ooo/trunk/main/shell/source/unix/exec/shellexec.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/shell/source/unix/exec/shellexec.cxx?rev=1199930&r1=1199929&r2=1199930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/shell/source/unix/exec/shellexec.cxx (original)
+++ incubator/ooo/trunk/main/shell/source/unix/exec/shellexec.cxx Wed Nov  9 19:40:47 2011
@@ -44,6 +44,9 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#ifdef OS2
+#include <process.h>
+#endif
 
 //------------------------------------------------------------------------
 // namespace directives



Mime
View raw message