Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 32C019E30 for ; Thu, 16 Feb 2012 14:15:33 +0000 (UTC) Received: (qmail 79404 invoked by uid 500); 16 Feb 2012 14:15:33 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 79318 invoked by uid 500); 16 Feb 2012 14:15:33 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 79310 invoked by uid 99); 16 Feb 2012 14:15:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 14:15:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 14:15:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6F60A2388860; Thu, 16 Feb 2012 14:15:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1244985 - in /incubator/ooo/trunk/main/sal/osl/os2: debug_printf.c file_url.cxx makefile.mk Date: Thu, 16 Feb 2012 14:15:05 -0000 To: ooo-commits@incubator.apache.org From: ydario@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120216141505.6F60A2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 #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