Author: ydario
Date: Thu Feb 16 14:15:04 2012
New Revision: 1244985
URL: http://svn.apache.org/viewvc?rev=1244985&view=rev
Log:
i118923 - OS/2 port: autom export of debug printf, skip more chars in file://./
urls.
Modified:
incubator/ooo/trunk/main/sal/osl/os2/debug_printf.c
incubator/ooo/trunk/main/sal/osl/os2/file_url.cxx
incubator/ooo/trunk/main/sal/osl/os2/makefile.mk
Modified: incubator/ooo/trunk/main/sal/osl/os2/debug_printf.c
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/osl/os2/debug_printf.c?rev=1244985&r1=1244984&r2=1244985&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/osl/os2/debug_printf.c (original)
+++ incubator/ooo/trunk/main/sal/osl/os2/debug_printf.c Thu Feb 16 14:15:04 2012
@@ -28,6 +28,7 @@
#ifdef TESTME
#include <stdio.h>
#endif
+#include "sal/types.h"
typedef APIRET _PMPRINTF(const char*, ...);
typedef _PMPRINTF* PMPRINTF;
@@ -35,7 +36,7 @@ typedef _PMPRINTF* PMPRINTF;
static void* hmodPmPrintf = NULL;
static PMPRINTF pfnPmPrintf = NULL;
-int _Export debug_printf( const char* format, ...)
+int SAL_DLLPUBLIC_EXPORT debug_printf( const char* format, ...)
{
va_list args;
int cnt;
Modified: incubator/ooo/trunk/main/sal/osl/os2/file_url.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/osl/os2/file_url.cxx?rev=1244985&r1=1244984&r2=1244985&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/osl/os2/file_url.cxx (original)
+++ incubator/ooo/trunk/main/sal/osl/os2/file_url.cxx Thu Feb 16 14:15:04 2012
@@ -98,6 +98,8 @@ rtl_uString* oslMakeUStrFromPsz(const s
extern "C" int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
extern "C" int TextToUnicode(const char* text, size_t text_buffer_size,
sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
+#define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING,
RTL_TEXTENCODING_UTF8).pData->buffer
+
/***************************************************
* namespace directives
**************************************************/
@@ -831,7 +833,7 @@ oslFileError SAL_CALL _osl_getSystemPath
)
nSkip = 17;
else
- nSkip = 5;
+ nSkip = 7;
/* Indicates local root */
if ( nDecodedLen == nSkip )
Modified: incubator/ooo/trunk/main/sal/osl/os2/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/osl/os2/makefile.mk?rev=1244985&r1=1244984&r2=1244985&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/osl/os2/makefile.mk (original)
+++ incubator/ooo/trunk/main/sal/osl/os2/makefile.mk Thu Feb 16 14:15:04 2012
@@ -103,7 +103,8 @@ OBJFILES= $(OBJ)$/conditn.obj \
$(OBJ)$/file_path_helper.obj \
$(OBJ)$/debug.obj \
$(OBJ)$/except.obj \
- $(SLO)$/salinit.obj
+ $(OBJ)$/debug_printf.obj \
+ $(OBJ)$/salinit.obj
.ENDIF
