CWS gnumake: resync to m91; conflicts unresolved

6 files changed, 0 insertions, 108 deletions

diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 0c7985e05ec3..4d5427f3875c 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -141,10 +141,6 @@ BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert,
 SvStringHashTable::SvStringHashTable( UINT32 nMaxEntries )
         : SvHashTable( nMaxEntries )
 {
-#ifdef WIN
-    DBG_ASSERT( (UINT32)nMaxEntries * sizeof( SvStringHashEntry ) <= 0xFF00,
-                "Hash table size cannot exeed 64k byte" )
-#endif
     pEntries = new SvStringHashEntry[ nMaxEntries ];
 
     // RefCount auf eins setzen
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 38b8d8260bb2..579c81a5ec16 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -146,11 +146,7 @@ SvToken & SvToken::operator = ( const SvToken & rObj )
 *************************************************************************/
 void SvTokenStream::InitCtor()
 {
-#ifdef DOS
-    SetCharSet( CHARSET_ANSI );
-#else
     SetCharSet( gsl_getSystemTextEncoding() );
-#endif
     aStrTrue    = "TRUE";
     aStrFalse   = "FALSE";
     nLine       = nColumn = 0;
@@ -251,11 +247,7 @@ void SvTokenStream::SetCharSet( CharSet nSet )
 {
     nCharSet = nSet;
 
-#ifdef DOS
-    pCharTab = SvChar::GetTable( nSet, CHARSET_ANSI );
-#else
     pCharTab = SvChar::GetTable( nSet, gsl_getSystemTextEncoding() );
-#endif
 }
 
 /*************************************************************************
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index e8c5bf1f0470..06e7e2d7c69c 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -697,10 +697,8 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
 *************************************************************************/
 void SvIdlDataBase::Write( const ByteString & rText )
 {
-#ifndef W31
     if( nVerbosity != 0 )
         fprintf( stdout, "%s", rText.GetBuffer() );
-#endif
 }
 
 /*************************************************************************
@@ -714,7 +712,6 @@ void SvIdlDataBase::WriteError( const ByteString & rErrWrn,
                                 ULONG nRow, ULONG nColumn ) const
 {
     //Fehlerbehandlung
-#ifndef W31
     fprintf( stderr, "\n%s --- %s: ( %ld, %ld )\n",
              rFileName.GetBuffer(), rErrWrn.GetBuffer(), nRow, nColumn );
 
@@ -722,7 +719,6 @@ void SvIdlDataBase::WriteError( const ByteString & rErrWrn,
     { // Fehler gesetzt
         fprintf( stderr, "\t%s\n", rErrorText.GetBuffer() );
     }
-#endif
 }
 
 /*************************************************************************
@@ -733,7 +729,6 @@ void SvIdlDataBase::WriteError( const ByteString & rErrWrn,
 void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
 {
     //Fehlerbehandlung
-#ifndef W31
     String aFileName( rInStm.GetFileName() );
     ByteString aErrorText;
     ULONG   nRow = 0, nColumn = 0;
@@ -793,7 +788,6 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
         if( aN.Len() )
             fprintf( stderr, "%s versus %s\n", pTok->GetString().GetBuffer(), aN.GetBuffer() );
     }
-#endif
 }
 
 /****************** SvIdlWorkingBase ****************************************/
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 83a730e404ad..4956cc9392a0 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -35,15 +35,6 @@
 #include <database.hxx>
 
 /****************** G L O B A L S ****************************************/
-#ifdef DOS
-static IdlDll * pApp = NULL;
-IdlDll * GetIdlApp()
-{
-    if( !pApp )
-        pApp = new IdlDll();
-    return pApp;
-}
-#else
 IdlDll * GetIdlApp()
 {
     if( !(*(IdlDll**)GetAppData(SHL_IDL)) )
@@ -55,7 +46,6 @@ IdlDll * GetIdlApp()
     }
     return (*(IdlDll**)GetAppData(SHL_IDL));
 }
-#endif
 
 IdlDll::IdlDll()
     : pHashTable( NULL )
diff --git a/idl/source/prj/idldll.cxx b/idl/source/prj/idldll.cxx
deleted file mode 100644
index 607cc91e1bf6..000000000000
--- a/idl/source/prj/idldll.cxx
+++ /dev/null
@@ -1,79 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_idl.hxx"
-
-#ifdef WIN
-#include <svwin.h>
-
-#ifndef _SYSDEP_HXX
-#include <sysdep.hxx>
-#endif
-
-// Statische DLL-Verwaltungs-Variablen
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-
-/***************************************************************************
-|*
-|*    LibMain()
-|*
-|*    Beschreibung       Initialisierungsfunktion der DLL
-|*    Ersterstellung     TH 05.05.93
-|*    Letzte Aenderung   TH 05.05.93
-|*
-***************************************************************************/
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-/***************************************************************************
-|*
-|*    WEP()
-|*
-|*    Beschreibung      DLL-Deinitialisierung
-|*    Ersterstellung     TH 05.05.93
-|*    Letzte Aenderung   TH 05.05.93
-|*
-***************************************************************************/
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/idl/source/prj/makefile.mk b/idl/source/prj/makefile.mk
index 3e0a55a7fd05..c33d2e9f3d7a 100644
--- a/idl/source/prj/makefile.mk
+++ b/idl/source/prj/makefile.mk
@@ -41,7 +41,6 @@ CDEFS+=-DIDL_COMPILER
 OBJFILES=   $(OBJ)$/command.obj      \
             $(OBJ)$/svidl.obj		\
             $(OBJ)$/globals.obj      \
-            $(OBJ)$/idldll.obj       \
             $(OBJ)$/database.obj
 
 # --- Targets ------------------------------------------------------------