i118582: OS/2 port - pyuno, readlicense, svtools, toolkit and tools build patches by Yuri Dario.

8 files changed, 30 insertions, 30 deletions

diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 4e676f2c3436..69143cc274a1 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -126,6 +126,12 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
 ))
 endif
 
+ifeq ($(GUI),OS2)
+$(eval $(call gb_Library_add_exception_objects,tl,\
+    tools/os2/source/dll/toolsdll \
+))
+endif
+
 ifeq ($(SYSTEM_ZLIB),YES)
 $(eval $(call gb_Library_set_cxxflags,tl,\
     $$(CXXFLAGS) \
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index b879573831ac..e728187b4a9d 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -23,7 +23,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_tools.hxx"
-#ifdef UNX
+#if defined(UNX) || defined(OS2)
 #include <unistd.h>
 #endif
 
diff --git a/tools/os2/source/dll/toolsdll.cxx b/tools/os2/source/dll/toolsdll.cxx
index 1898b8c5b6fe..0c7fb977a0f1 100644
--- a/tools/os2/source/dll/toolsdll.cxx
+++ b/tools/os2/source/dll/toolsdll.cxx
@@ -21,13 +21,7 @@
 
 
 
-#ifndef _SHL_HXX
 #include <tools/shl.hxx>
-#endif
-
-#ifndef _DLL_HXX
-#include <dll.hxx>
-#endif
 
 // =======================================================================
 
@@ -35,7 +29,7 @@ static void* aAppData[SHL_COUNT];
 
 // -----------------------------------------------------------------------
 
-void** GetAppData( USHORT nSharedLib )
+void** GetAppData( sal_uInt16 nSharedLib )
 {
     return &(aAppData[nSharedLib]);
 }
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index cc227246bc4f..7ba1dbf4687c 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -142,7 +142,7 @@ static void DaysToDate( long nDays,
 Date::Date()
 {
 #if defined( OS2 )
-    DATETIME aDateTime;
+    PM_DATETIME aDateTime;
     DosGetDateTime( &aDateTime );
 
     // Datum zusammenbauen
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index b2a896937cc1..fde7f16b8bde 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -96,7 +96,7 @@ static Time Sec100ToTime( sal_Int32 nSec100 )
 Time::Time()
 {
 #if defined( OS2 )
-    DATETIME aDateTime;
+    PM_DATETIME aDateTime;
     DosGetDateTime( &aDateTime );
 
     // Zeit zusammenbauen
@@ -316,7 +316,7 @@ Time Time::GetUTCOffset()
 {
 #if defined( OS2 )
 #undef timezone
-    DATETIME aDateTime;
+    PM_DATETIME aDateTime;
     DosGetDateTime( &aDateTime );
 
     // Zeit zusammenbauen
diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx
index 5a4c71cb59fb..96bac5088c71 100644
--- a/tools/source/fsys/os2.cxx
+++ b/tools/source/fsys/os2.cxx
@@ -49,8 +49,8 @@ DECLARE_LIST( FSysSortList, FSysSort* );
 DECLARE_LIST( FileStatList, FileStat* );
 
 static char sCaseMap[256];
-static BOOL bCaseMap = FALSE;
-static BOOL bDriveMap = FALSE;
+static sal_Bool bCaseMap = FALSE;
+static sal_Bool bDriveMap = FALSE;
 
 struct DriveMapItem
 {
@@ -64,7 +64,7 @@ void CreateDriveMapImpl();
 
 static DriveMapItem aDriveMap[26];
 
-static BOOL   bLastCaseSensitive    = FALSE;
+static sal_Bool   bLastCaseSensitive    = FALSE;
 
 //====================================================================
 
@@ -146,7 +146,7 @@ char* volumeid( const char* pPfad )
 |*
 *************************************************************************/
 
-BOOL DirEntry::ToAbs()
+sal_Bool DirEntry::ToAbs()
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -207,7 +207,7 @@ String DirEntry::GetVolume() const
 |*
 *************************************************************************/
 
-BOOL DirEntry::SetCWD( BOOL bSloppy ) const
+sal_Bool DirEntry::SetCWD( sal_Bool bSloppy ) const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -242,7 +242,7 @@ BOOL DirEntry::SetCWD( BOOL bSloppy ) const
 *************************************************************************/
 
 #if 0 // YD see dirent.cxx
-BOOL createLongNameEA( const PCSZ pszPath, ULONG ulAttributes, const String& aLongName );
+sal_Bool createLongNameEA( const PCSZ pszPath, ULONG ulAttributes, const String& aLongName );
 
 FSysError DirEntry::MoveTo( const DirEntry& rDest ) const
 {
@@ -450,7 +450,7 @@ struct _FSYS_FSQBUFFER
     UCHAR       sBuf[256];
 };
 
-BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL bAccessRemovableDevice )
+sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool bAccessRemovableDevice )
 {
     nSize = 0;
     FSysPathStyle eStyle = FSYS_STYLE_UNKNOWN;
@@ -604,7 +604,7 @@ BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL bAccessRemovableDevice )
     return TRUE;
 }
 
-BOOL IsRedirectable_Impl( const ByteString &rPath )
+sal_Bool IsRedirectable_Impl( const ByteString &rPath )
 {
     if ( rPath.Len() >= 3 && ':' == rPath.GetBuffer()[1] )
     {
@@ -616,7 +616,7 @@ BOOL IsRedirectable_Impl( const ByteString &rPath )
 }
 
 #if 0
-BOOL IsRedirectable_Impl( const String &rPath )
+sal_Bool IsRedirectable_Impl( const String &rPath )
 {
     if ( rPath.Len() >= 3 && ':' == rPath.GetStr()[1] )
     {
@@ -643,7 +643,7 @@ const char* TempDirImpl( char *pBuf )
 {
     PSZ         pVar;
     USHORT      nRet;
-    BOOL        bAppendTemp = FALSE; // mu\s noch \\temp angeh"angt werden
+    sal_Bool        bAppendTemp = FALSE; // mu\s noch \\temp angeh"angt werden
 
     // Erstmal sehen, ob TEMP oder TMP gesetzt sind
     nRet = DosScanEnv( (PSZ)"TEMP", &pVar );
@@ -659,7 +659,7 @@ const char* TempDirImpl( char *pBuf )
     // falls das geklappt hat, und ein Backslash dranhaengt,
     // oder falls es bisher nicht geklappt hat,
     // muessen wir nachher einen Backslash entfernen
-    BOOL bRemoveBS = nRet || *(pVar+strlen(pVar)-1) == '\\';
+    sal_Bool bRemoveBS = nRet || *(pVar+strlen(pVar)-1) == '\\';
 
     // Keine temp-Variable gefunden, dann gehen wir mal auf die Suche
     // nach dem System-Laufwerk
@@ -790,7 +790,7 @@ void CreateDriveMapImpl()
     DosError(FERR_DISABLEHARDERR);
 
     // determine number of floppy-drives
-    BYTE nFloppies;
+    PM_BYTE nFloppies;
     nRet = DosDevConfig( (void*) &nFloppies, DEVINFO_FLOPPY );
 
     // reset the map
@@ -812,7 +812,7 @@ void CreateDriveMapImpl()
     for ( nDrive = 2; nDrive < 26; ++nDrive )
     {
         // open drive
-        BOOL bFixed;
+        sal_Bool bFixed;
         HFILE nDevHandle;
         char pDriveName[3] = "#:";
         pDriveName[0] = nDrive+'a';
@@ -826,7 +826,7 @@ void CreateDriveMapImpl()
         if ( !nRet )
         {
             // removeable?
-            BYTE nDriveId = nDrive;
+            PM_BYTE nDriveId = nDrive;
             ULONG nParaOutLen, nDataOutLen;
             nRet = DosDevIOCtl(nDevHandle, 8, 0x20,
                 &nDriveId, sizeof(nDriveId), &nParaOutLen,
@@ -932,7 +932,7 @@ FSysPathStyle DirEntry::GetPathStyle( const String &rDevice )
 |*
 *************************************************************************/
 
-BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
+sal_Bool DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
 {
     if (eFormatter==FSYS_STYLE_HOST)
     {
@@ -947,7 +947,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
     }
     else
     {
-        BOOL isCaseSensitive = FALSE;           // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv
+        sal_Bool isCaseSensitive = FALSE;           // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv
         switch ( eFormatter )
         {
             case FSYS_STYLE_MAC:
@@ -1003,7 +1003,7 @@ ErrCode FileStat::QueryDiskSpace( const String &rPath,
 
 //=========================================================================
 
-void FSysEnableSysErrorBox( BOOL bEnable )
+void FSysEnableSysErrorBox( sal_Bool bEnable )
 {
     DosError( bEnable ? 0 : FERR_DISABLEHARDERR );
 }
diff --git a/tools/source/fsys/os2.hxx b/tools/source/fsys/os2.hxx
index c9f0df8d97ac..9b6476e5dc66 100644
--- a/tools/source/fsys/os2.hxx
+++ b/tools/source/fsys/os2.hxx
@@ -59,7 +59,7 @@ String ToLowerImpl( const String& );
 
 #define START_DRV       'a'
 
-inline BOOL DRIVE_EXISTS( char c )
+inline PM_BOOL DRIVE_EXISTS( char c )
 {
     ULONG  nCur, nMap;
     APIRET nRet = DosQueryCurrentDisk( &nCur, &nMap );
diff --git a/tools/source/generic/toolsin.cxx b/tools/source/generic/toolsin.cxx
index 18dc42d100a9..0f8ba2d9b977 100644
--- a/tools/source/generic/toolsin.cxx
+++ b/tools/source/generic/toolsin.cxx
@@ -85,7 +85,7 @@ void GlobalDeInitTools()
 #if defined WNT
     ImpDeInitWinTools();
 #endif
-#ifdef OS2
+#ifdef OS2_YD_REMOVEME
     ImpDeInitOS2Tools();
 #endif
 }